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

Commit a6ecdfcf authored by Al Viro's avatar Al Viro
Browse files

untangling do_lookup() - merge d_alloc_and_lookup() callers 



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

fs/namei.c

+3 −3
Original line number Diff line number Diff line
@@ -1188,12 +1188,12 @@ static int do_lookup(struct nameidata *nd, struct qstr *name, 
				}

				if (!d_invalidate(dentry)) {

					dput(dentry);

					dentry = d_alloc_and_lookup(parent, name, nd);

					dentry = NULL;

				}

			}

		} else if (!dentry) {

			dentry = d_alloc_and_lookup(parent, name, nd);

		}

		if (!dentry)

			dentry = d_alloc_and_lookup(parent, name, nd);

	l:

		mutex_unlock(&dir->i_mutex);

		if (IS_ERR(dentry))