git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[pandora-kernel.git]
/
fs
/
nfs
/
namespace.c
diff --git
a/fs/nfs/namespace.c
b/fs/nfs/namespace.c
index
2f285ef
..
66df08d
100644
(file)
--- a/
fs/nfs/namespace.c
+++ b/
fs/nfs/namespace.c
@@
-129,7
+129,7
@@
static void * nfs_follow_mountpoint(struct dentry *dentry, struct nameidata *nd)
goto out_err;
mntget(mnt);
- err = do_add_mount(mnt,
nd
, nd->path.mnt->mnt_flags|MNT_SHRINKABLE,
+ err = do_add_mount(mnt,
&nd->path
, nd->path.mnt->mnt_flags|MNT_SHRINKABLE,
&nfs_automount_list);
if (err < 0) {
mntput(mnt);