btrfs: simplify insert_orphan_item
authorDavid Sterba <dsterba@suse.cz>
Fri, 2 Jan 2015 18:12:57 +0000 (19:12 +0100)
committerDavid Sterba <dsterba@suse.cz>
Wed, 14 Jan 2015 18:23:48 +0000 (19:23 +0100)
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>
fs/btrfs/tree-log.c

index 5be45c1..25a1c36 100644 (file)
@@ -1254,21 +1254,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;
 }