]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: abort transaction if we fail to update the delayed inode
authorJosef Bacik <josef@toxicpanda.com>
Fri, 21 May 2021 20:44:09 +0000 (16:44 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Jul 2021 14:55:55 +0000 (16:55 +0200)
[ Upstream commit 04587ad9bef6ce9d510325b4ba9852b6129eebdb ]

If we fail to update the delayed inode we need to abort the transaction,
because we could leave an inode with the improper counts or some other
such corruption behind.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/btrfs/delayed-inode.c

index 3af06ef98b12a20c1154be814d53ec43e600f42e..04422d929c232f79a9c6edf9bf555f3045ce8670 100644 (file)
@@ -1073,6 +1073,14 @@ err_out:
        btrfs_delayed_inode_release_metadata(fs_info, node, (ret < 0));
        btrfs_release_delayed_inode(node);
 
+       /*
+        * If we fail to update the delayed inode we need to abort the
+        * transaction, because we could leave the inode with the improper
+        * counts behind.
+        */
+       if (ret && ret != -ENOENT)
+               btrfs_abort_transaction(trans, ret);
+
        return ret;
 
 search: