Skip to content

Commit

Permalink
Revert "Workaround issue of Linux vdev_disk.c, (openzfs#16678)"
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
robn committed Oct 25, 2024
1 parent 75d0ceb commit 7d9e466
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions module/zfs/zio.c
Original file line number Diff line number Diff line change
Expand Up @@ -187,20 +187,6 @@ zio_init(void)
continue;
#endif

#if defined(__linux__) && defined(_KERNEL)
/*
* Workaround issue of Linux vdev_disk.c, in some cases not
* linearizing buffers with disk sector crossing a page
* boundary. It is fine for hardware, but somehow required by
* LUKS. It is not typical for ZFS to produce such buffers, but
* it may happen if 6KB block is compressed to 4KB, while still
* having 2KB alignment. Banning the 6KB buffers helps vdevs
* with ashifh=12.
*/
if (size > PAGESIZE && !IS_P2ALIGNED(size, PAGESIZE))
continue;
#endif

if (IS_P2ALIGNED(size, PAGESIZE))
align = PAGESIZE;
else
Expand Down

0 comments on commit 7d9e466

Please sign in to comment.