[PATCH v3 077/110] namei: simplify failure exits in get_link()

[Al Viro]

From: Al Viro <viro@xxxxxxxxxxxxxxxxxx>

when cookie is NULL, put_link() is equivalent to path_put(), so
as soon as we'd set last->cookie to NULL, we can bump nd->depth and
let the normal logics in terminate_walk() to take care of cleanups.

Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
---
 fs/namei.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index f311f03..678aeef 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -904,27 +904,23 @@ const char *get_link(struct nameidata *nd)
 
 	last->link = nd->link;
 	last->cookie = NULL;
+	nd->depth++;
 
 	cond_resched();
 
 	touch_atime(&last->link);
 
 	error = security_inode_follow_link(dentry);
-	res = ERR_PTR(error);
 	if (error)
-		goto out;
+		return ERR_PTR(error);
 
 	nd->last_type = LAST_BIND;
 	res = inode->i_link;
 	if (!res) {
 		res = inode->i_op->follow_link(dentry, &last->cookie);
-		if (IS_ERR(res)) {
-out:
-			path_put(&last->link);
-			return res;
-		}
+		if (IS_ERR_OR_NULL(res))
+			last->cookie = NULL;
 	}
-	nd->depth++;
 	return res;
 }
 
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/