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

link_path_walk: nd->depth massage, part 2 



collapse adjacent increment/decrement pairs.

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

fs/namei.c

+0 −8
Original line number Diff line number Diff line
@@ -1832,8 +1832,6 @@ static int link_path_walk(const char *name, struct nameidata *nd) 
				break;

			}



			nd->depth++;

			nd->depth--;

			s = get_link(nd);

			nd->depth++;
@@ -1847,8 +1845,6 @@ static int link_path_walk(const char *name, struct nameidata *nd) 
				/* jumped */

				nd->depth--;

				put_link(nd);

				nd->depth++;

				nd->depth--;

			} else {

				if (*s == '/') {

					if (!nd->root.mnt)
@@ -1878,8 +1874,6 @@ static int link_path_walk(const char *name, struct nameidata *nd) 
	while (unlikely(nd->depth > 1)) {

		nd->depth--;

		put_link(nd);

		nd->depth++;

		nd->depth--;

	}

	nd->depth--;

	return err;
@@ -1889,8 +1883,6 @@ static int link_path_walk(const char *name, struct nameidata *nd) 
		err = walk_component(nd, LOOKUP_FOLLOW);

		nd->depth--;

		put_link(nd);

		nd->depth++;

		nd->depth--;

		goto Walked;

	}

	nd->depth--;