Skip to content

Commit 625e093

Browse files
committed
Revert "Workaround issue of Linux vdev_disk.c, (#16678)"
Now that we can handle these different alignments, we don't this workaround. This reverts commit aefc2da. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Signed-off-by: Rob Norris <[email protected]>
1 parent 406a48f commit 625e093

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

module/zfs/zio.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -187,20 +187,6 @@ zio_init(void)
187187
continue;
188188
#endif
189189

190-
#if defined(__linux__) && defined(_KERNEL)
191-
/*
192-
* Workaround issue of Linux vdev_disk.c, in some cases not
193-
* linearizing buffers with disk sector crossing a page
194-
* boundary. It is fine for hardware, but somehow required by
195-
* LUKS. It is not typical for ZFS to produce such buffers, but
196-
* it may happen if 6KB block is compressed to 4KB, while still
197-
* having 2KB alignment. Banning the 6KB buffers helps vdevs
198-
* with ashifh=12.
199-
*/
200-
if (size > PAGESIZE && !IS_P2ALIGNED(size, PAGESIZE))
201-
continue;
202-
#endif
203-
204190
if (IS_P2ALIGNED(size, PAGESIZE))
205191
align = PAGESIZE;
206192
else

0 commit comments

Comments
 (0)