diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-18 09:04:20 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-18 09:04:20 -0400 |
| commit | 7cc90cc3ffe22a0d81b8d605b20a82ec7911012d (patch) | |
| tree | a870fc960dd10a12be6fb905ea266c65547c11bb | |
| parent | b12cea9198fa99ffd3de1776c323bc7464d26b44 (diff) | |
| download | kernel_goldelico_gta04-7cc90cc3ffe22a0d81b8d605b20a82ec7911012d.zip kernel_goldelico_gta04-7cc90cc3ffe22a0d81b8d605b20a82ec7911012d.tar.gz kernel_goldelico_gta04-7cc90cc3ffe22a0d81b8d605b20a82ec7911012d.tar.bz2 | |
don't pass 'mounting_here' flag to follow_down()
it's always false now
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/namei.c | 4 | ||||
| -rw-r--r-- | fs/nfsd/vfs.c | 2 | ||||
| -rw-r--r-- | include/linux/namei.h | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -1065,7 +1065,7 @@ failed: * Care must be taken as namespace_sem may be held (indicated by mounting_here * being true). */ -int follow_down(struct path *path, bool mounting_here) +int follow_down(struct path *path) { unsigned managed; int ret; @@ -1086,7 +1086,7 @@ int follow_down(struct path *path, bool mounting_here) BUG_ON(!path->dentry->d_op); BUG_ON(!path->dentry->d_op->d_manage); ret = path->dentry->d_op->d_manage( - path->dentry, mounting_here, false); + path->dentry, false, false); if (ret < 0) return ret == -EISDIR ? 0 : ret; } diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index da1d970..ff93025 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -87,7 +87,7 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp, .dentry = dget(dentry)}; int err = 0; - err = follow_down(&path, false); + err = follow_down(&path); if (err < 0) goto out; diff --git a/include/linux/namei.h b/include/linux/namei.h index 9c86038..eba45ea 100644 --- a/include/linux/namei.h +++ b/include/linux/namei.h @@ -85,7 +85,7 @@ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry extern struct dentry *lookup_one_len(const char *, struct dentry *, int); extern int follow_down_one(struct path *); -extern int follow_down(struct path *, bool); +extern int follow_down(struct path *); extern int follow_up(struct path *); extern struct dentry *lock_rename(struct dentry *, struct dentry *); |