diff options
| author | Chris Mason <clm@fb.com> | 2015-01-21 17:45:25 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-01-21 17:45:25 -0800 |
| commit | d3541834884f042aaaab1d6c0610cdc3488028e4 (patch) | |
| tree | d6f8f0ac6c98b1f996dfcaae5df0ba33a6fa5251 /fs/btrfs/tree-log.c | |
| parent | Btrfs: track dirty block groups on their own list (diff) | |
| parent | btrfs: expand btrfs_find_item if found_key is NULL (diff) | |
| download | linux-d3541834884f042aaaab1d6c0610cdc3488028e4.tar.gz linux-d3541834884f042aaaab1d6c0610cdc3488028e4.zip | |
Merge branch 'fix/find-item-path-leak' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 9a02da16f2be..25a1c363a5f4 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -1254,13 +1254,14 @@ 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; - ret = btrfs_find_item(root, NULL, BTRFS_ORPHAN_OBJECTID, - offset, BTRFS_ORPHAN_ITEM_KEY, NULL); - if (ret > 0) - ret = btrfs_insert_orphan_item(trans, root, offset); + + ret = btrfs_insert_orphan_item(trans, root, ino); + if (ret == -EEXIST) + ret = 0; + return ret; } |