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 tag 'v3.10.59' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
fs
/
btrfs
/
send.c
diff --git
a/fs/btrfs/send.c
b/fs/btrfs/send.c
index 256a9a46d5443f657921aacb62abdd7a9bafac81..414c1b9eb8964cb4cf099819e682d5f625f7cfa3 100644
(file)
--- a/
fs/btrfs/send.c
+++ b/
fs/btrfs/send.c
@@
-1550,6
+1550,10
@@
static int lookup_dir_item_inode(struct btrfs_root *root,
goto out;
}
btrfs_dir_item_key_to_cpu(path->nodes[0], di, &key);
+ if (key.type == BTRFS_ROOT_ITEM_KEY) {
+ ret = -ENOENT;
+ goto out;
+ }
*found_inode = key.objectid;
*found_type = btrfs_dir_type(path->nodes[0], di);