From: Christoph Hellwig <hch@lst.de>
Date: Sun, 17 Nov 2024 05:23:16 +0000 (+0100)
Subject: xfs: disable FITRIM for zoned RT devices
X-Git-Tag: v6.15-rc1~149^2~7^2~5^2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f044dda35124bca5da6d3ad6885ba2c542bfe68f;p=thirdparty%2Fkernel%2Flinux.git

xfs: disable FITRIM for zoned RT devices

The zoned allocator unconditionally issues zone resets or discards after
emptying an entire zone, so supporting FITRIM for a zoned RT device is
not useful.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
---

diff --git a/fs/xfs/xfs_discard.c b/fs/xfs/xfs_discard.c
index 3f2403a7b49ca..c1a306268ae43 100644
--- a/fs/xfs/xfs_discard.c
+++ b/fs/xfs/xfs_discard.c
@@ -844,7 +844,8 @@ xfs_ioc_trim(
 
 	if (!capable(CAP_SYS_ADMIN))
 		return -EPERM;
-	if (mp->m_rtdev_targp &&
+
+	if (mp->m_rtdev_targp && !xfs_has_zoned(mp) &&
 	    bdev_max_discard_sectors(mp->m_rtdev_targp->bt_bdev))
 		rt_bdev = mp->m_rtdev_targp->bt_bdev;
 	if (!bdev_max_discard_sectors(mp->m_ddev_targp->bt_bdev) && !rt_bdev)