[PATCH v2] xfs: Add error handling for xfs_reflink_cancel_cow_range

Wentao Liang posted 1 patch 6 days, 1 hour ago
fs/xfs/xfs_inode.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
[PATCH v2] xfs: Add error handling for xfs_reflink_cancel_cow_range
Posted by Wentao Liang 6 days, 1 hour ago
In xfs_inactive(), xfs_reflink_cancel_cow_range() is called
without error handling, risking unnoticed failures and
inconsistent behavior compared to other parts of the code.

Fix this issue by adding an error handling for the
xfs_reflink_cancel_cow_range(), improving code robustness.

Fixes: 6231848c3aa5 ("xfs: check for cow blocks before trying to clear them")
Cc: <stable@vger.kernel.org> # v4.17
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
---
 fs/xfs/xfs_inode.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index c8ad2606f928..1ff514b6c035 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1404,8 +1404,11 @@ xfs_inactive(
 		goto out;
 
 	/* Try to clean out the cow blocks if there are any. */
-	if (xfs_inode_has_cow_data(ip))
-		xfs_reflink_cancel_cow_range(ip, 0, NULLFILEOFF, true);
+	if (xfs_inode_has_cow_data(ip)) {
+		error = xfs_reflink_cancel_cow_range(ip, 0, NULLFILEOFF, true);
+		if (error)
+			goto out;
+	}
 
 	if (VFS_I(ip)->i_nlink != 0) {
 		/*
-- 
2.42.0.windows.2
Re: [PATCH v2] xfs: Add error handling for xfs_reflink_cancel_cow_range
Posted by Carlos Maiolino 1 day, 18 hours ago
On Fri, 24 Jan 2025 11:45:09 +0800, Wentao Liang wrote:
> In xfs_inactive(), xfs_reflink_cancel_cow_range() is called
> without error handling, risking unnoticed failures and
> inconsistent behavior compared to other parts of the code.
> 
> Fix this issue by adding an error handling for the
> xfs_reflink_cancel_cow_range(), improving code robustness.
> 
> [...]

Applied to for-next, thanks!

[1/1] xfs: Add error handling for xfs_reflink_cancel_cow_range
      commit: 26b63bee2f6e711c5a169997fd126fddcfb90848

Best regards,
-- 
Carlos Maiolino <cem@kernel.org>