Commit 0fd889d5 authored by Al Viro's avatar Al Viro
Browse files

get_link: nd->depth massage, part 6 



make get_link() increment nd->depth on successful exit

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

fs/namei.c

+2 −3
Original line number Diff line number Diff line
@@ -918,8 +918,10 @@ const char *get_link(struct nameidata *nd) 
out:

			path_put(&nd->path);

			path_put(&last->link);

			return res;

		}

	}

	nd->depth++;

	return res;

}
@@ -1830,11 +1832,9 @@ static int link_path_walk(const char *name, struct nameidata *nd) 
			}



			s = get_link(nd);

			nd->depth++;



			if (unlikely(IS_ERR(s))) {

				err = PTR_ERR(s);

				nd->depth--;

				goto Err;

			}

			err = 0;
@@ -2009,7 +2009,6 @@ static int trailing_symlink(struct nameidata *nd) 
	s = get_link(nd);

	if (unlikely(IS_ERR(s)))

		return PTR_ERR(s);

	nd->depth++;

	if (unlikely(!s)) {

		nd->depth--;

		return 0;