aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTsutomu Itoh <t-itoh@jp.fujitsu.com>2015-08-19 01:55:00 -0400
committerChris Mason <clm@fb.com>2015-08-31 14:46:41 -0400
commit527afb4493c2892ce89fb74648e72a30b68ba120 (patch)
tree6e65e787a12ab45f33a4f6576046c7d33b902998
parentc6dd6ea55758cf403bdc07a51a06c2a1d474f906 (diff)
Btrfs: cleanup: remove unnecessary check before btrfs_free_path is called
We need not check path before btrfs_free_path() is called because path is checked in btrfs_free_path(). Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com> Reviewed-by: Qu Wenruo <quwenruo@cn.fujitsu.com> Signed-off-by: Chris Mason <clm@fb.com>
-rw-r--r--fs/btrfs/dev-replace.c3
-rw-r--r--fs/btrfs/inode.c3
-rw-r--r--fs/btrfs/tree-defrag.c3
3 files changed, 3 insertions, 6 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 564a7de17d99..e54dd5905cee 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -183,8 +183,7 @@ no_valid_dev_replace_entry_found:
183 } 183 }
184 184
185out: 185out:
186 if (path) 186 btrfs_free_path(path);
187 btrfs_free_path(path);
188 return ret; 187 return ret;
189} 188}
190 189
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index bda3c41dc9d5..37dd8d0f1fb3 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -6905,8 +6905,7 @@ out:
6905 6905
6906 trace_btrfs_get_extent(root, em); 6906 trace_btrfs_get_extent(root, em);
6907 6907
6908 if (path) 6908 btrfs_free_path(path);
6909 btrfs_free_path(path);
6910 if (trans) { 6909 if (trans) {
6911 ret = btrfs_end_transaction(trans, root); 6910 ret = btrfs_end_transaction(trans, root);
6912 if (!err) 6911 if (!err)
diff --git a/fs/btrfs/tree-defrag.c b/fs/btrfs/tree-defrag.c
index a4b9c8b2d35a..f31db4325339 100644
--- a/fs/btrfs/tree-defrag.c
+++ b/fs/btrfs/tree-defrag.c
@@ -115,8 +115,7 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
115 ret = -EAGAIN; 115 ret = -EAGAIN;
116 } 116 }
117out: 117out:
118 if (path) 118 btrfs_free_path(path);
119 btrfs_free_path(path);
120 if (ret == -EAGAIN) { 119 if (ret == -EAGAIN) {
121 if (root->defrag_max.objectid > root->defrag_progress.objectid) 120 if (root->defrag_max.objectid > root->defrag_progress.objectid)
122 goto done; 121 goto done;