From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 19 Apr 2015 00:09:08 +0000 (-0400)
Subject: link_path_walk: massage a bit more
X-Git-Tag: v4.2-rc1~180^2~90
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=48c8b0c57176ba081c13abdca8334b9d88c4e4d6;p=linux.git

link_path_walk: massage a bit more

Pull the block after the if-else in the end of what used to be do-while
body into all branches there.  We are almost done with the massage...

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

diff --git a/fs/namei.c b/fs/namei.c
index 6a0dd0782c7d..b7ba71889afb 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1803,6 +1803,8 @@ static int link_path_walk(const char *name, struct nameidata *nd)
 			if (unlikely(!s)) {
 				/* jumped */
 				put_link(nd, &link, cookie);
+				current->link_count--;
+				nd->depth--;
 			} else {
 				if (*s == '/') {
 					if (!nd->root.mnt)
@@ -1816,18 +1818,23 @@ static int link_path_walk(const char *name, struct nameidata *nd)
 				err = link_path_walk(s, nd);
 				if (unlikely(err)) {
 					put_link(nd, &link, cookie);
+					current->link_count--;
+					nd->depth--;
+					return err;
 				} else {
 					err = walk_component(nd, LOOKUP_FOLLOW);
 					put_link(nd, &link, cookie);
-					if (err > 0)
+					current->link_count--;
+					nd->depth--;
+					if (err < 0)
+						return err;
+					if (err > 0) {
+						current->link_count++;
+						nd->depth++;
 						goto loop;
+					}
 				}
 			}
-
-			current->link_count--;
-			nd->depth--;
-			if (err)
-				return err;
 		}
 		if (!d_can_lookup(nd->path.dentry)) {
 			err = -ENOTDIR;