Commit 939724df authored May 03, 2015 by Al Viro

link_path_walk: nd->depth massage, part 10



Get rid of orig_depth checks in OK: logics.  If nd->depth is
zero, we had been called from path_init() and we are done.
If it is greater than 1, we are not done, whether we'd been
called from path_init() or trailing_symlink().  And in
case when it's 1, we might have been called from path_init()
and reached the end of nested symlink (in which case
nd->stack[0].name will point to the rest of pathname and
we are not done) or from trailing_symlink(), in which case
we are done.

Just have trailing_symlink() leave NULL in nd->stack[0].name
and use that to discriminate between those cases.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

parent dc7af8dc

fs/namei.c

+10 −7

Original line number	Diff line number	Diff line
		@@ -1872,14 +1872,16 @@ Err:
		put_link(nd);
		return err;
		OK:
		if (unlikely(nd->depth > orig_depth)) {
		if (!nd->depth) /* called from path_init(), done */
		return 0;
		name = nd->stack[nd->depth - 1].name;
		if (!name) /* called from trailing_symlink(), done */
		return 0;

		err = walk_component(nd, LOOKUP_FOLLOW);
		put_link(nd);
		goto Walked;
		}
		return 0;
		}

		static int path_init(int dfd, const struct filename *name, unsigned int flags,
		struct nameidata *nd)
		@@ -2014,6 +2016,7 @@ static int trailing_symlink(struct nameidata *nd)
		nd->flags \|= LOOKUP_JUMPED;
		}
		nd->inode = nd->path.dentry->d_inode;
		nd->stack[0].name = NULL;
		error = link_path_walk(s, nd);
		if (unlikely(error))
		put_link(nd);

Admin message