aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-03-18 09:04:20 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-03-18 09:04:20 -0400
commit7cc90cc3ffe22a0d81b8d605b20a82ec7911012d (patch)
treea870fc960dd10a12be6fb905ea266c65547c11bb
parentb12cea9198fa99ffd3de1776c323bc7464d26b44 (diff)
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.c4
-rw-r--r--fs/nfsd/vfs.c2
-rw-r--r--include/linux/namei.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/namei.c b/fs/namei.c
index b912b7abe747..e092648a068c 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1065,7 +1065,7 @@ failed:
1065 * Care must be taken as namespace_sem may be held (indicated by mounting_here 1065 * Care must be taken as namespace_sem may be held (indicated by mounting_here
1066 * being true). 1066 * being true).
1067 */ 1067 */
1068int follow_down(struct path *path, bool mounting_here) 1068int follow_down(struct path *path)
1069{ 1069{
1070 unsigned managed; 1070 unsigned managed;
1071 int ret; 1071 int ret;
@@ -1086,7 +1086,7 @@ int follow_down(struct path *path, bool mounting_here)
1086 BUG_ON(!path->dentry->d_op); 1086 BUG_ON(!path->dentry->d_op);
1087 BUG_ON(!path->dentry->d_op->d_manage); 1087 BUG_ON(!path->dentry->d_op->d_manage);
1088 ret = path->dentry->d_op->d_manage( 1088 ret = path->dentry->d_op->d_manage(
1089 path->dentry, mounting_here, false); 1089 path->dentry, false, false);
1090 if (ret < 0) 1090 if (ret < 0)
1091 return ret == -EISDIR ? 0 : ret; 1091 return ret == -EISDIR ? 0 : ret;
1092 } 1092 }
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index da1d9701f8e4..ff93025ae2f7 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,
87 .dentry = dget(dentry)}; 87 .dentry = dget(dentry)};
88 int err = 0; 88 int err = 0;
89 89
90 err = follow_down(&path, false); 90 err = follow_down(&path);
91 if (err < 0) 91 if (err < 0)
92 goto out; 92 goto out;
93 93
diff --git a/include/linux/namei.h b/include/linux/namei.h
index 9c8603872c36..eba45ea10298 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
85extern struct dentry *lookup_one_len(const char *, struct dentry *, int); 85extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
86 86
87extern int follow_down_one(struct path *); 87extern int follow_down_one(struct path *);
88extern int follow_down(struct path *, bool); 88extern int follow_down(struct path *);
89extern int follow_up(struct path *); 89extern int follow_up(struct path *);
90 90
91extern struct dentry *lock_rename(struct dentry *, struct dentry *); 91extern struct dentry *lock_rename(struct dentry *, struct dentry *);