Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -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;

		}

fs/nfsd/vfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/namei.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *);