From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 19 Apr 2015 00:14:20 +0000 (-0400)
Subject: link_path_walk: get rid of duplication
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bb8603f8e166e49f02f865213feee7afddeac9b0;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

link_path_walk: get rid of duplication

What we do after the second walk_component() + put_link() + depth
decrement in there is exactly equivalent to what's done right
after the first walk_component().  Easy to verify and not at all
surprising, seeing that there we have just walked the last
component of nested symlink.

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

diff --git a/fs/namei.c b/fs/namei.c
index b7ba71889afb..9f45d339cf45 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1771,6 +1771,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
 			return 0;
 
 		err = walk_component(nd, LOOKUP_FOLLOW);
+Walked:
 		if (err < 0)
 			return err;
 
@@ -1789,7 +1790,6 @@ static int link_path_walk(const char *name, struct nameidata *nd)
 			nd->depth++;
 			current->link_count++;
 
-loop:	/* will be gone very soon */
 			link = nd->link;
 			s = get_link(&link, nd, &cookie);
 
@@ -1826,13 +1826,7 @@ loop:	/* will be gone very soon */
 					put_link(nd, &link, cookie);
 					current->link_count--;
 					nd->depth--;
-					if (err < 0)
-						return err;
-					if (err > 0) {
-						current->link_count++;
-						nd->depth++;
-						goto loop;
-					}
+					goto Walked;
 				}
 			}
 		}