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

Commit 5a8d87e8 authored by Al Viro's avatar Al Viro
Browse files

namei: unlazy_walk() doesn't need to mess with current->fs anymore 



now that we have ->root_seq, legitimize_path(&nd->root, nd->root_seq)
will do just fine...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 203bc643

fs/namei.c

+4 −7
Original line number Diff line number Diff line
@@ -651,7 +651,6 @@ static bool legitimize_links(struct nameidata *nd) 
 */

static int unlazy_walk(struct nameidata *nd, struct dentry *dentry, unsigned seq)

{

	struct fs_struct *fs = current->fs;

	struct dentry *parent = nd->path.dentry;



	BUG_ON(!(nd->flags & LOOKUP_RCU));
@@ -691,13 +690,11 @@ static int unlazy_walk(struct nameidata *nd, struct dentry *dentry, unsigned seq 
	 * still valid and get it if required.

	 */

	if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) {

		spin_lock(&fs->lock);

		if (unlikely(!path_equal(&nd->root, &fs->root))) {

			spin_unlock(&fs->lock);

			goto drop_dentry;

		if (unlikely(!legitimize_path(nd, &nd->root, nd->root_seq))) {

			rcu_read_unlock();

			dput(dentry);

			return -ECHILD;

		}

		path_get(&nd->root);

		spin_unlock(&fs->lock);

	}



	rcu_read_unlock();