[PATCH] Btrfs: fix simple_return.cocci warnings

From: kbuild test robot <lkp@intel.com>
To: Omar Sandoval <osandov@osandov.com>
Cc: kbuild-all@01.org, linux-btrfs@vger.kernel.org,
	Omar Sandoval <osandov@osandov.com>
Subject: [PATCH] Btrfs: fix simple_return.cocci warnings
Date: Wed, 30 Sep 2015 12:35:45 +0800	[thread overview]
Message-ID: <20150930043545.GA11964@athens> (raw)
In-Reply-To: <3319d371e22491b6901af33842b57db37b77c52c.1443583874.git.osandov@osandov.com>

fs/btrfs/free-space-tree.c:1255:1-4: WARNING: end returns can be simpified
fs/btrfs/free-space-tree.c:1168:1-4: WARNING: end returns can be simpified

 Simplify a trivial if-return sequence.  Possibly combine with a
 preceding function call.

Generated by: scripts/coccinelle/misc/simple_return.cocci

CC: Omar Sandoval <osandov@fb.com>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
---

 free-space-tree.c |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

--- a/fs/btrfs/free-space-tree.c
+++ b/fs/btrfs/free-space-tree.c
@@ -1165,11 +1165,7 @@ int btrfs_create_free_space_tree(struct
 
 	btrfs_set_fs_compat_ro(fs_info, FREE_SPACE_TREE);
 
-	ret = btrfs_commit_transaction(trans, tree_root);
-	if (ret)
-		return ret;
-
-	return 0;
+	return btrfs_commit_transaction(trans, tree_root);
 
 abort:
 	btrfs_abort_transaction(trans, tree_root, ret);
@@ -1252,11 +1248,7 @@ int btrfs_clear_free_space_tree(struct b
 	free_extent_buffer(free_space_root->commit_root);
 	kfree(free_space_root);
 
-	ret = btrfs_commit_transaction(trans, tree_root);
-	if (ret)
-		return ret;
-
-	return 0;
+	return btrfs_commit_transaction(trans, tree_root);
 
 abort:
 	btrfs_abort_transaction(trans, tree_root, ret);
