From: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Date: Wed, 1 Aug 2018 03:32:31 +0000 (+0800)
Subject: btrfs: Remove redundant btrfs_release_path from btrfs_unlink_subvol
X-Git-Tag: v3.16.83~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce79733c2614cea213be581d1dda8485eccc8acf;p=thirdparty%2Fkernel%2Fstable.git

btrfs: Remove redundant btrfs_release_path from btrfs_unlink_subvol

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>
---

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index e3463a6777724..8ac270f3fa92c 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -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);