Commit 7cc90cc3 authored by Al Viro's avatar Al Viro

don't pass 'mounting_here' flag to follow_down()

it's always false now
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent b12cea91
...@@ -1065,7 +1065,7 @@ static int follow_dotdot_rcu(struct nameidata *nd) ...@@ -1065,7 +1065,7 @@ static int follow_dotdot_rcu(struct nameidata *nd)
* Care must be taken as namespace_sem may be held (indicated by mounting_here * Care must be taken as namespace_sem may be held (indicated by mounting_here
* being true). * being true).
*/ */
int follow_down(struct path *path, bool mounting_here) int follow_down(struct path *path)
{ {
unsigned managed; unsigned managed;
int ret; int ret;
...@@ -1086,7 +1086,7 @@ int follow_down(struct path *path, bool mounting_here) ...@@ -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);
BUG_ON(!path->dentry->d_op->d_manage); BUG_ON(!path->dentry->d_op->d_manage);
ret = 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) if (ret < 0)
return ret == -EISDIR ? 0 : ret; return ret == -EISDIR ? 0 : ret;
} }
......
...@@ -87,7 +87,7 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp, ...@@ -87,7 +87,7 @@ nfsd_cross_mnt(struct svc_rqst *rqstp, struct dentry **dpp,
.dentry = dget(dentry)}; .dentry = dget(dentry)};
int err = 0; int err = 0;
err = follow_down(&path, false); err = follow_down(&path);
if (err < 0) if (err < 0)
goto out; goto out;
......
...@@ -85,7 +85,7 @@ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry ...@@ -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 struct dentry *lookup_one_len(const char *, struct dentry *, int);
extern int follow_down_one(struct path *); 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 int follow_up(struct path *);
extern struct dentry *lock_rename(struct dentry *, struct dentry *); extern struct dentry *lock_rename(struct dentry *, struct dentry *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment