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 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
[firefly-linux-kernel-4.4.55.git]
/
fs
/
pnode.c
diff --git
a/fs/pnode.c
b/fs/pnode.c
index bed378db075813350362c39f423d1b4335240bfa..3e000a51ac0d09556d184d26422a91d0bc4c0ff9 100644
(file)
--- a/
fs/pnode.c
+++ b/
fs/pnode.c
@@
-237,8
+237,9
@@
int propagate_mnt(struct mount *dest_mnt, struct dentry *dest_dentry,
source = get_source(m, prev_dest_mnt, prev_src_mnt, &type);
source = get_source(m, prev_dest_mnt, prev_src_mnt, &type);
- if (!(child = copy_tree(source, source->mnt.mnt_root, type))) {
- ret = -ENOMEM;
+ child = copy_tree(source, source->mnt.mnt_root, type);
+ if (IS_ERR(child)) {
+ ret = PTR_ERR(child);
list_splice(tree_list, tmp_list.prev);
goto out;
}
list_splice(tree_list, tmp_list.prev);
goto out;
}