From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 22 Apr 2015 16:02:25 +0000 (-0400)
Subject: do_last: kill symlink_ok
X-Git-Tag: v4.2-rc1~180^2~107
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fd2805be238947eb819284189205e8de6f6c41c4;p=karo-tx-linux.git

do_last: kill symlink_ok

When O_PATH is present, O_CREAT isn't, so symlink_ok is always equal to
(open_flags & O_PATH) && !(nd->flags & LOOKUP_FOLLOW).

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

diff --git a/fs/namei.c b/fs/namei.c
index 4c1a8bf917e4..3e452338f1b7 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2931,7 +2931,6 @@ static int do_last(struct nameidata *nd, struct path *path,
 	bool got_write = false;
 	int acc_mode = op->acc_mode;
 	struct inode *inode;
-	bool symlink_ok = false;
 	struct path save_parent = { .dentry = NULL, .mnt = NULL };
 	bool retried = false;
 	int error;
@@ -2949,8 +2948,6 @@ static int do_last(struct nameidata *nd, struct path *path,
 	if (!(open_flag & O_CREAT)) {
 		if (nd->last.name[nd->last.len])
 			nd->flags |= LOOKUP_FOLLOW | LOOKUP_DIRECTORY;
-		if (open_flag & O_PATH && !(nd->flags & LOOKUP_FOLLOW))
-			symlink_ok = true;
 		/* we _can_ be in RCU mode here */
 		error = lookup_fast(nd, path, &inode);
 		if (likely(!error))
@@ -3050,7 +3047,8 @@ retry_lookup:
 	}
 finish_lookup:
 	/* we _can_ be in RCU mode here */
-	if (should_follow_link(path->dentry, !symlink_ok)) {
+	if (should_follow_link(path->dentry,
+			!(open_flag & O_PATH) || (nd->flags & LOOKUP_FOLLOW))) {
 		if (nd->flags & LOOKUP_RCU) {
 			if (unlikely(nd->path.mnt != path->mnt ||
 				     unlazy_walk(nd, path->dentry))) {