Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932908AbbEKSaq (ORCPT ); Mon, 11 May 2015 14:30:46 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:47166 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754963AbbEKSIU (ORCPT ); Mon, 11 May 2015 14:08:20 -0400 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3 037/110] namei: rename follow_link to trailing_symlink, move it down Date: Mon, 11 May 2015 19:06:57 +0100 Message-Id: <1431367690-5223-37-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20150511180650.GA4147@ZenIV.linux.org.uk> References: <20150511180650.GA4147@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3478 Lines: 123 From: Al Viro Signed-off-by: Al Viro --- fs/namei.c | 62 ++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index f7659ee..d729ef7 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -668,8 +668,6 @@ static __always_inline void set_root(struct nameidata *nd) get_fs_root(current->fs, &nd->root); } -static int link_path_walk(const char *, struct nameidata *); - static __always_inline unsigned set_root_rcu(struct nameidata *nd) { struct fs_struct *fs = current->fs; @@ -880,33 +878,6 @@ out: return res; } -static int follow_link(struct path *link, struct nameidata *nd, void **p) -{ - const char *s; - int error = may_follow_link(link, nd); - if (unlikely(error)) - return error; - nd->flags |= LOOKUP_PARENT; - s = get_link(link, nd, p); - if (unlikely(IS_ERR(s))) - return PTR_ERR(s); - if (unlikely(!s)) - return 0; - if (*s == '/') { - if (!nd->root.mnt) - set_root(nd); - path_put(&nd->path); - nd->path = nd->root; - path_get(&nd->root); - nd->flags |= LOOKUP_JUMPED; - } - nd->inode = nd->path.dentry->d_inode; - error = link_path_walk(s, nd); - if (unlikely(error)) - put_link(nd, link, *p); - return error; -} - static int follow_up_rcu(struct path *path) { struct mount *mnt = real_mount(path->mnt); @@ -1970,6 +1941,33 @@ static void path_cleanup(struct nameidata *nd) fput(nd->base); } +static int trailing_symlink(struct path *link, struct nameidata *nd, void **p) +{ + const char *s; + int error = may_follow_link(link, nd); + if (unlikely(error)) + return error; + nd->flags |= LOOKUP_PARENT; + s = get_link(link, nd, p); + if (unlikely(IS_ERR(s))) + return PTR_ERR(s); + if (unlikely(!s)) + return 0; + if (*s == '/') { + if (!nd->root.mnt) + set_root(nd); + path_put(&nd->path); + nd->path = nd->root; + path_get(&nd->root); + nd->flags |= LOOKUP_JUMPED; + } + nd->inode = nd->path.dentry->d_inode; + error = link_path_walk(s, nd); + if (unlikely(error)) + put_link(nd, link, *p); + return error; +} + static inline int lookup_last(struct nameidata *nd) { if (nd->last_type == LAST_NORM && nd->last.name[nd->last.len]) @@ -2005,7 +2003,7 @@ static int path_lookupat(int dfd, const struct filename *name, while (err > 0) { void *cookie; struct path link = nd->link; - err = follow_link(&link, nd, &cookie); + err = trailing_symlink(&link, nd, &cookie); if (err) break; err = lookup_last(nd); @@ -2351,7 +2349,7 @@ path_mountpoint(int dfd, const struct filename *name, struct path *path, while (err > 0) { void *cookie; struct path link = *path; - err = follow_link(&link, nd, &cookie); + err = trailing_symlink(&link, nd, &cookie); if (err) break; err = mountpoint_last(nd, path); @@ -3235,7 +3233,7 @@ static struct file *path_openat(int dfd, struct filename *pathname, struct path link = nd->link; void *cookie; nd->flags &= ~(LOOKUP_OPEN|LOOKUP_CREATE|LOOKUP_EXCL); - error = follow_link(&link, nd, &cookie); + error = trailing_symlink(&link, nd, &cookie); if (unlikely(error)) break; error = do_last(nd, file, op, &opened, pathname); -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/