Commit b0c24c3b authored Apr 18, 2015 by Al Viro

link_path_walk: handle get_link() returning ERR_PTR() immediately

If we get ERR_PTR() from get_link(), we are guaranteed to get err != 0
when we break out of do-while, so we are going to hit if (err) return err;
shortly after it. Pull that into the if (IS_ERR(s)) body.

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

parent 95fa25d9

fs/namei.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1792,7 +1792,9 @@ static int link_path_walk(const char name, struct nameidata nd)

		if (unlikely(IS_ERR(s))) {
		err = PTR_ERR(s);
		break;
		current->link_count--;
		nd->depth--;
		return err;
		}
		err = 0;
		if (likely(s)) {

Admin message