]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: Remove redundant btrfs_release_path from btrfs_unlink_subvol
authorLu Fengqi <lufq.fnst@cn.fujitsu.com>
Wed, 1 Aug 2018 03:32:31 +0000 (11:32 +0800)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 28 Apr 2020 18:03:01 +0000 (19:03 +0100)
commit 5b7d687ad5913a56b6a8788435d7a53990b4176d upstream.

Although it is safe to call this on already released paths with no locks
held or extent buffers, removing the redundant btrfs_release_path is
reasonable.

Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
[bwh: Backported to 3.16 as dependency of commit d49d3287e74f
 "btrfs: fix invalid removal of root ref"]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
fs/btrfs/inode.c

index e3463a67777246fcf44a8f7caebb18672947411c..8ac270f3fa92c861025fa500458c5c45ee8ab4c4 100644 (file)
@@ -4031,7 +4031,6 @@ int btrfs_unlink_subvol(struct btrfs_trans_handle *trans,
 
                leaf = path->nodes[0];
                btrfs_item_key_to_cpu(leaf, &key, path->slots[0]);
-               btrfs_release_path(path);
                index = key.offset;
        }
        btrfs_release_path(path);