OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.11-rc7' into stable/for-linus-3.12
[android-x86/kernel.git]
/
fs
/
namespace.c
diff --git
a/fs/namespace.c
b/fs/namespace.c
index
7b1ca9b
..
a45ba4f
100644
(file)
--- a/
fs/namespace.c
+++ b/
fs/namespace.c
@@
-1429,7
+1429,7
@@
struct vfsmount *collect_mounts(struct path *path)
CL_COPY_ALL | CL_PRIVATE);
namespace_unlock();
if (IS_ERR(tree))
- return
NULL
;
+ return
ERR_CAST(tree)
;
return &tree->mnt;
}