projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cleanup/blocksize-diet-part2' of git://git.kernel.org/pub/scm/linux...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
btrfs
/
tree-log.c
diff --git
a/fs/btrfs/tree-log.c
b/fs/btrfs/tree-log.c
index 4a42edc224a8aa52ac77c899c35db5f293aa4c2a..67e5bf709dcad3a12063438223ee38a146428917 100644
(file)
--- 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,
}
static int insert_orphan_item(struct btrfs_trans_handle *trans,
- struct btrfs_root *root, u64
offset
)
+ struct btrfs_root *root, u64
ino
)
{
int ret;
{
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;
}
return ret;
}