From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v9 09/34] vfs: add a reval argument to user_path_parent Date: Mon, 5 Nov 2012 10:21:48 -0500 Message-ID: <1352128933-28526-10-git-send-email-jlayton@redhat.com> References: <1352128933-28526-1-git-send-email-jlayton@redhat.com> Cc: linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, michael.brantley@deshaw.com, hch@infradead.org, miklos@szeredi.hu, pstaubach@exagrid.com To: viro@zeniv.linux.org.uk Return-path: Received: from mail-yh0-f46.google.com ([209.85.213.46]:48417 "EHLO mail-yh0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932891Ab2KEPWi (ORCPT ); Mon, 5 Nov 2012 10:22:38 -0500 Received: by mail-yh0-f46.google.com with SMTP id m54so972001yhm.19 for ; Mon, 05 Nov 2012 07:22:37 -0800 (PST) In-Reply-To: <1352128933-28526-1-git-send-email-jlayton@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: ...so we can tell it when to set LOOKUP_REVAL. Signed-off-by: Jeff Layton --- fs/namei.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 28d70cd..1569ccd 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2184,15 +2184,20 @@ int user_path_at(int dfd, const char __user *name, unsigned flags, * path-walking is complete. */ static struct filename * -user_path_parent(int dfd, const char __user *path, struct nameidata *nd) +user_path_parent(int dfd, const char __user *path, struct nameidata *nd, + unsigned int reval) { struct filename *s = getname(path); int error; + unsigned int flags = LOOKUP_PARENT; + + if (reval) + flags |= LOOKUP_REVAL; if (IS_ERR(s)) return s; - error = filename_lookup(dfd, s, LOOKUP_PARENT, nd); + error = filename_lookup(dfd, s, flags, nd); if (error) { putname(s); return ERR_PTR(error); @@ -3340,7 +3345,7 @@ static long do_rmdir(int dfd, const char __user *pathname) struct dentry *dentry; struct nameidata nd; - name = user_path_parent(dfd, pathname, &nd); + name = user_path_parent(dfd, pathname, &nd, 0); if (IS_ERR(name)) return PTR_ERR(name); @@ -3436,7 +3441,7 @@ static long do_unlinkat(int dfd, const char __user *pathname) struct nameidata nd; struct inode *inode = NULL; - name = user_path_parent(dfd, pathname, &nd); + name = user_path_parent(dfd, pathname, &nd, 0); if (IS_ERR(name)) return PTR_ERR(name); @@ -3831,13 +3836,13 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname, struct filename *to; int error; - from = user_path_parent(olddfd, oldname, &oldnd); + from = user_path_parent(olddfd, oldname, &oldnd, 0); if (IS_ERR(from)) { error = PTR_ERR(from); goto exit; } - to = user_path_parent(newdfd, newname, &newnd); + to = user_path_parent(newdfd, newname, &newnd, 0); if (IS_ERR(to)) { error = PTR_ERR(to); goto exit1; -- 1.7.11.7