From mboxrd@z Thu Jan 1 00:00:00 1970 From: Al Viro Subject: [PATCH 24/79] do_last: kill symlink_ok Date: Tue, 5 May 2015 06:21:58 +0100 Message-ID: <1430803373-4948-24-git-send-email-viro@ZenIV.linux.org.uk> References: <20150505052205.GS889@ZenIV.linux.org.uk> Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org To: Linus Torvalds Return-path: In-Reply-To: <20150505052205.GS889@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org From: Al Viro 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 --- fs/namei.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 308f325..58293a8 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2923,7 +2923,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; @@ -2941,8 +2940,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)) @@ -3043,7 +3040,8 @@ finish_lookup: goto out; } - 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))) { -- 2.1.4