don't pass 'mounting_here' flag to follow_down()
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 18 Mar 2011 13:04:20 +0000 (09:04 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 18 Mar 2011 13:04:20 +0000 (09:04 -0400)
it's always false now

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/namei.c
fs/nfsd/vfs.c
include/linux/namei.h

index b912b7a..e092648 100644 (file)
@@ -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;
                }
index da1d970..ff93025 100644 (file)
@@ -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;
 
index 9c86038..eba45ea 100644 (file)
@@ -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 *);