From: David Sterba <dsterba@suse.cz>
Date: Fri, 2 Jan 2015 18:12:57 +0000 (+0100)
Subject: btrfs: simplify insert_orphan_item
X-Git-Tag: v3.16.35~2397
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=924fc1ae76422682efefea82e9391c87680c1ed3;p=thirdparty%2Fkernel%2Fstable.git

btrfs: simplify insert_orphan_item

commit 9c4f61f01d269815bb7c37be3ede59c5587747c6 upstream.

We can search and add the orphan item in one go,
btrfs_insert_orphan_item will find out if the item already exists.

Signed-off-by: David Sterba <dsterba@suse.cz>
Cc: Chris Mason <clm@fb.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 0a8194955e6b9..700e6d860e0ce 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -1263,21 +1263,13 @@ out:
 }
 
 static int insert_orphan_item(struct btrfs_trans_handle *trans,
-			      struct btrfs_root *root, u64 offset)
+			      struct btrfs_root *root, u64 ino)
 {
 	int ret;
-	struct btrfs_path *path;
-
-	path = btrfs_alloc_path();
-	if (!path)
-		return -ENOMEM;
 
-	ret = btrfs_find_item(root, path, BTRFS_ORPHAN_OBJECTID,
-			offset, BTRFS_ORPHAN_ITEM_KEY, NULL);
-	if (ret > 0)
-		ret = btrfs_insert_orphan_item(trans, root, offset);
-
-	btrfs_free_path(path);
+	ret = btrfs_insert_orphan_item(trans, root, ino);
+	if (ret == -EEXIST)
+		ret = 0;
 
 	return ret;
 }