From: Filipe Manana <fdmanana@suse.com>
Date: Sun, 8 Feb 2026 18:30:08 +0000 (+0000)
Subject: btrfs: fix lost return value on error in finish_verity()
X-Git-Tag: v7.0-rc1~33^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29e525665a77a70ea8f19310e96b1b1472b07fc9;p=thirdparty%2Fkernel%2Flinux.git

btrfs: fix lost return value on error in finish_verity()

If btrfs_update_inode() or del_orphan() fail, we jump to the 'end_trans'
label and then return 0 instead of the error returned by one of those
calls. Fix this and return the error.

Fixes: 61fb7f04ee06 ("btrfs: remove out label in finish_verity()")
Reported-by: Chris Mason <clm@meta.com>
Link: https://lore.kernel.org/linux-btrfs/20260208161129.3888234-1-clm@meta.com/
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/fs/btrfs/verity.c b/fs/btrfs/verity.c
index 06cbd6f00a78c..95ea794f20d37 100644
--- a/fs/btrfs/verity.c
+++ b/fs/btrfs/verity.c
@@ -552,7 +552,7 @@ static int finish_verity(struct btrfs_inode *inode, const void *desc,
 	btrfs_set_fs_compat_ro(root->fs_info, VERITY);
 end_trans:
 	btrfs_end_transaction(trans);
-	return 0;
+	return ret;
 
 }