]> git.hungrycats.org Git - linux/commitdiff
btrfs: verity: propagate orphan insertion errors when enabling verity
authorguolingxing <guolingxing@tju.edu.cn>
Thu, 15 Oct 2026 09:59:01 +0000 (09:59 +0000)
committerDavid Sterba <dsterba@suse.com>
Fri, 30 Oct 2026 20:36:16 +0000 (21:36 +0100)
btrfs_begin_enable_verity() ignores the return value of
btrfs_orphan_add() and unconditionally returns 0. If orphan insertion
fails, btrfs_orphan_add() aborts the transaction, but the generic
fs-verity code still proceeds with Merkle tree construction because
the begin_enable_verity callback reported success.

Return the error so that fs-verity stops immediately instead of
continuing after the initialization failure.

The transaction is already aborted by btrfs_orphan_add() and the
handle is released by btrfs_end_transaction(), so no additional
cleanup is needed.

Fixes: 705242538ff3 ("btrfs: verity metadata orphan items")
Signed-off-by: guolingxing <guolingxing@tju.edu.cn>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/verity.c

index ccfa2ef97e504f80844c6dde4f3200f092dc403b..7cd884c0dd4da40b3534b82031eb4b88cdc454b7 100644 (file)
@@ -609,7 +609,7 @@ static int btrfs_begin_enable_verity(struct file *filp)
                set_bit(BTRFS_INODE_VERITY_IN_PROGRESS, &inode->runtime_flags);
        btrfs_end_transaction(trans);
 
-       return 0;
+       return ret;
 }
 
 /*