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

Commit fa4ee159 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro
Browse files

vfs: fix d_need_lookup/d_revalidate order in do_lookup 



Doing revalidate on a dentry which has not yet been looked up makes no sense.

Move the d_need_lookup() check before d_revalidate().

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 4613ad18

fs/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -1139,6 +1139,8 @@ static int do_lookup(struct nameidata *nd, struct qstr *name, 
			return -ECHILD;

		nd->seq = seq;



		if (unlikely(d_need_lookup(dentry)))

			goto unlazy;

		if (unlikely(dentry->d_flags & DCACHE_OP_REVALIDATE)) {

			status = d_revalidate(dentry, nd);

			if (unlikely(status <= 0)) {
@@ -1147,8 +1149,6 @@ static int do_lookup(struct nameidata *nd, struct qstr *name, 
				goto unlazy;

			}

		}

		if (unlikely(d_need_lookup(dentry)))

			goto unlazy;

		path->mnt = mnt;

		path->dentry = dentry;

		if (unlikely(!__follow_mount_rcu(nd, path, inode)))