From 562161239c25e7ec2f78d43155ed476d6faf742a Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Thu, 24 Oct 2024 11:27:14 +1100 Subject: [PATCH] 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 aefc2da8a594d7a8059c862eab464d5f798393b3. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Signed-off-by: Rob Norris --- module/zfs/zio.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/module/zfs/zio.c b/module/zfs/zio.c index 3c7305e0e72..a5daf73d59b 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -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