[PATCH] btrfs: abort transaction on failure to update inode for hole punching and reflinking

[PATCH] btrfs: abort transaction on failure to update inode for hole punching and reflinking

[fdmanana]

From: Filipe Manana <fdmanana@suse.com>

If we fail to update the inode we error out without aborting the
transaction, which can result in a persistent inconsistency if after
the failure the transaction is committed, as we have dropped file
extent items from a range and either punched a hole or insert a new file
extent item for that range (for reflinks).

So add the missing transaction abort.

Fixes: 2aaa66558172 ("Btrfs: add hole punching")
Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
 fs/btrfs/file.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 20e15dc30bfb..f978c6524aa0 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2509,8 +2509,10 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,
 					      inode_set_ctime_current(&inode->vfs_inode));
 
 		ret = btrfs_update_inode(trans, inode);
-		if (ret)
+		if (unlikely(ret)) {
+			btrfs_abort_transaction(trans, ret);
 			break;
+		}
 
 		btrfs_end_transaction(trans);
 		btrfs_btree_balance_dirty(fs_info);
-- 
2.47.2

Re: [PATCH] btrfs: abort transaction on failure to update inode for hole punching and reflinking

[Qu Wenruo]

在 2026/9/17 00:32, fdmanana@kernel.org 写道:
> From: Filipe Manana <fdmanana@suse.com>
> 
> If we fail to update the inode we error out without aborting the
> transaction, which can result in a persistent inconsistency if after
> the failure the transaction is committed, as we have dropped file
> extent items from a range and either punched a hole or insert a new file
> extent item for that range (for reflinks).
> 
> So add the missing transaction abort.
> 
> Fixes: 2aaa66558172 ("Btrfs: add hole punching")
> Signed-off-by: Filipe Manana <fdmanana@suse.com>

Reviewed-by: Qu Wenruo <wqu@suse.com>

Thanks,
Qu> ---
>   fs/btrfs/file.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
> index 20e15dc30bfb..f978c6524aa0 100644
> --- a/fs/btrfs/file.c
> +++ b/fs/btrfs/file.c
> @@ -2509,8 +2509,10 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode,
>   					      inode_set_ctime_current(&inode->vfs_inode));
>   
>   		ret = btrfs_update_inode(trans, inode);
> -		if (ret)
> +		if (unlikely(ret)) {
> +			btrfs_abort_transaction(trans, ret);
>   			break;
> +		}
>   
>   		btrfs_end_transaction(trans);
>   		btrfs_btree_balance_dirty(fs_info);