Skip to content

Commit

Permalink
don't pass 'mounting_here' flag to follow_down()
Browse files Browse the repository at this point in the history
it's always false now

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Mar 18, 2011
1 parent b12cea9 commit 7cc90cc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
* being true).
*/
int follow_down(struct path *path, bool mounting_here)
int follow_down(struct path *path)
{
unsigned managed;
int ret;
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion fs/nfsd/vfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion include/linux/namei.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);
Expand Down

0 comments on commit 7cc90cc

Please sign in to comment.