diff options
| author | David Sterba <dsterba@suse.cz> | 2015-01-02 19:12:57 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-04-23 14:58:24 -0400 |
| commit | b3d55b2f8587c96f82878b984383390509dd9a05 (patch) | |
| tree | d0b6062182a34badd07922e9e472b497888a4c82 /fs/btrfs | |
| parent | 171c32b52ffc589df108ea24de1a07ade16e7195 (diff) | |
| download | lwn-b3d55b2f8587c96f82878b984383390509dd9a05.tar.gz lwn-b3d55b2f8587c96f82878b984383390509dd9a05.zip | |
btrfs: simplify insert_orphan_item
[ Upstream commit 9c4f61f01d269815bb7c37be3ede59c5587747c6 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/tree-log.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 8b40b35e5e0e..3b68c75eccea 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -1266,21 +1266,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; } |