summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2015-01-02 19:12:57 +0100
committerDavid Sterba <dsterba@suse.cz>2015-01-14 19:23:48 +0100
commit9c4f61f01d269815bb7c37be3ede59c5587747c6 (patch)
treee0e02273a94ae41c71f58a4262ffd853780bc0a9
parentc234a24de91837db6f00aeebe28e3daddc53c1b7 (diff)
downloadlinux-9c4f61f01d269815bb7c37be3ede59c5587747c6.tar.gz
linux-9c4f61f01d269815bb7c37be3ede59c5587747c6.tar.bz2
linux-9c4f61f01d269815bb7c37be3ede59c5587747c6.zip
btrfs: simplify insert_orphan_item
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>
-rw-r--r--fs/btrfs/tree-log.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 5be45c12dd71..25a1c363a5f4 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -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;
}