Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932212AbbEKSTp (ORCPT ); Mon, 11 May 2015 14:19:45 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:47440 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755019AbbEKSI1 (ORCPT ); Mon, 11 May 2015 14:08:27 -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 083/110] namei: kill nd->link Date: Mon, 11 May 2015 19:07:43 +0100 Message-Id: <1431367690-5223-83-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: 2464 Lines: 89 From: Al Viro Just store it in nd->stack[nd->depth].link right in pick_link(). Now that we make sure of stack expansion in pick_link(), we can do so... Signed-off-by: Al Viro --- fs/namei.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 82cb1bc..277ca86 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -495,10 +495,7 @@ EXPORT_SYMBOL(path_put); #define EMBEDDED_LEVELS 2 struct nameidata { struct path path; - union { - struct qstr last; - struct path link; - }; + struct qstr last; struct path root; struct inode *inode; /* path.dentry.d_inode */ unsigned int flags; @@ -787,7 +784,7 @@ static inline int may_follow_link(struct nameidata *nd) return 0; /* Allowed if owner and follower match. */ - inode = nd->link.dentry->d_inode; + inode = nd->stack[0].link.dentry->d_inode; if (uid_eq(current_cred()->fsuid, inode->i_uid)) return 0; @@ -800,8 +797,8 @@ static inline int may_follow_link(struct nameidata *nd) if (uid_eq(parent->i_uid, inode->i_uid)) return 0; - audit_log_link_denied("follow_link", &nd->link); - path_put(&nd->link); + audit_log_link_denied("follow_link", &nd->stack[0].link); + path_put(&nd->stack[0].link); path_put(&nd->path); return -EACCES; } @@ -879,14 +876,13 @@ static __always_inline const char *get_link(struct nameidata *nd) { struct saved *last = nd->stack + nd->depth; - struct dentry *dentry = nd->link.dentry; + struct dentry *dentry = last->link.dentry; struct inode *inode = dentry->d_inode; int error; const char *res; BUG_ON(nd->flags & LOOKUP_RCU); - last->link = nd->link; last->cookie = NULL; nd->depth++; @@ -1560,6 +1556,7 @@ static void terminate_walk(struct nameidata *nd) static int pick_link(struct nameidata *nd, struct path *link) { int error; + struct saved *last; if (unlikely(nd->total_link_count++ >= MAXSYMLINKS)) { path_to_nameidata(link, nd); return -ELOOP; @@ -1578,7 +1575,8 @@ static int pick_link(struct nameidata *nd, struct path *link) return error; } - nd->link = *link; + last = nd->stack + nd->depth; + last->link = *link; return 1; } -- 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/