Btrfs: cleanup: remove unnecessary check before btrfs_free_path is called

Tsutomu Itoh · masoncl · commit 527afb4493c2 · 2015-08-31T11:46:41.000-07:00
We need not check path before btrfs_free_path() is called because
path is checked in btrfs_free_path().

Signed-off-by: Tsutomu Itoh &lt;t-itoh@jp.fujitsu.com&gt;
Reviewed-by: Qu Wenruo &lt;quwenruo@cn.fujitsu.com&gt;
Signed-off-by: Chris Mason &lt;clm@fb.com&gt;
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
@@ -183,8 +183,7 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info)
 	}
 
 out:
-	if (path)
-		btrfs_free_path(path);
+	btrfs_free_path(path);
 	return ret;
 }
 
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
@@ -6905,8 +6905,7 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
 
 	trace_btrfs_get_extent(root, em);
 
-	if (path)
-		btrfs_free_path(path);
+	btrfs_free_path(path);
 	if (trans) {
 		ret = btrfs_end_transaction(trans, root);
 		if (!err)
diff --git 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,
 		ret = -EAGAIN;
 	}
 out:
-	if (path)
-		btrfs_free_path(path);
+	btrfs_free_path(path);
 	if (ret == -EAGAIN) {
 		if (root->defrag_max.objectid > root->defrag_progress.objectid)
 			goto done;

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,7 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info)`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`out:`
`186`		`- if (path)`
`187`		`- btrfs_free_path(path);`
	`186`	`+ btrfs_free_path(path);`
`188`	`187`	`return ret;`
`189`	`188`	`}`
`190`	`189`