diff options
| author | David Sterba <dsterba@suse.cz> | 2015-01-02 19:12:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-19 10:11:06 +0200 |
| commit | 5ab0f4da798ac88c2f320806b872212cabbc7f5d (patch) | |
| tree | a4e4369f8fc2f2e4a9c536733ab13a4d338e6061 | |
| parent | 79ea2bfc7d9cac1949bec2cb09b622becb7d54b6 (diff) | |
| download | lwn-5ab0f4da798ac88c2f320806b872212cabbc7f5d.tar.gz lwn-5ab0f4da798ac88c2f320806b872212cabbc7f5d.zip | |
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>
Cc: Roman Mamedov <rm@romanrm.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 a7f32bfdd5e7..ec8b6542c8bd 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -1235,21 +1235,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; } |