From: Jeff Layton <jlayton@redhat.com>
To: viro@ZenIV.linux.org.uk
Cc: linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org,
linux-kernel@vger.kernel.org, miklos@szeredi.hu,
hch@infradead.org, michael.brantley@deshaw.com
Subject: [PATCH v1 07/12] vfs: add a "reval" flag to args for user_path_parent
Date: Thu, 26 Apr 2012 11:57:18 -0400 [thread overview]
Message-ID: <1335455843-16089-6-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1335455843-16089-1-git-send-email-jlayton@redhat.com>
All of the current callers set this to "false" for now, but we'll fix
them later to set it to true when they retry on an ESTALE error.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
fs/namei.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index e9da40b..b1b116b 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1908,15 +1908,19 @@ int user_path_at(int dfd, const char __user *name, unsigned flags,
}
static int user_path_parent(int dfd, const char __user *path,
- struct nameidata *nd, char **name)
+ struct nameidata *nd, char **name, bool reval)
{
char *s = getname(path);
int error;
+ unsigned int lookup_flags = LOOKUP_PARENT;
if (IS_ERR(s))
return PTR_ERR(s);
- error = do_path_lookup(dfd, s, LOOKUP_PARENT, nd);
+ if (reval)
+ lookup_flags |= LOOKUP_REVAL;
+
+ error = do_path_lookup(dfd, s, lookup_flags, nd);
if (error)
putname(s);
else
@@ -2759,7 +2763,7 @@ static long do_rmdir(int dfd, const char __user *pathname)
struct dentry *dentry;
struct nameidata nd;
- error = user_path_parent(dfd, pathname, &nd, &name);
+ error = user_path_parent(dfd, pathname, &nd, &name, false);
if (error)
return error;
@@ -2856,7 +2860,7 @@ static long do_unlinkat(int dfd, const char __user *pathname)
struct nameidata nd;
struct inode *inode = NULL;
- error = user_path_parent(dfd, pathname, &nd, &name);
+ error = user_path_parent(dfd, pathname, &nd, &name, false);
if (error)
return error;
@@ -3255,11 +3259,11 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
char *to;
int error;
- error = user_path_parent(olddfd, oldname, &oldnd, &from);
+ error = user_path_parent(olddfd, oldname, &oldnd, &from, false);
if (error)
goto exit;
- error = user_path_parent(newdfd, newname, &newnd, &to);
+ error = user_path_parent(newdfd, newname, &newnd, &to, false);
if (error)
goto exit1;
--
1.7.7.6
next prev parent reply other threads:[~2012-04-26 15:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-26 15:57 [PATCH v1 02/12] vfs: make fstatat retry on ESTALE errors from getattr call Jeff Layton
2012-04-26 15:57 ` [PATCH v1 03/12] vfs: fix readlinkat to retry on ESTALE Jeff Layton
2012-04-26 15:57 ` [PATCH v1 04/12] vfs: add new "reval" argument to kern_path_create and user_path_create Jeff Layton
2012-04-26 15:57 ` [PATCH v1 05/12] vfs: fix mknodat to retry on ESTALE errors Jeff Layton
2012-04-26 15:57 ` [PATCH v1 06/12] vfs: fix mkdir " Jeff Layton
2012-04-26 15:57 ` Jeff Layton [this message]
2012-04-26 15:57 ` [PATCH v1 08/12] vfs: make rmdir " Jeff Layton
2012-04-26 15:57 ` [PATCH v1 09/12] vfs: make do_unlinkat " Jeff Layton
2012-04-26 15:57 ` [PATCH v1 10/12] vfs: fix symlinkat to " Jeff Layton
[not found] ` <1335455843-16089-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2012-04-26 15:57 ` [PATCH v1 11/12] vfs: fix linkat " Jeff Layton
2012-04-26 15:57 ` [PATCH v1 12/12] vfs: fix renameat " Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335455843-16089-6-git-send-email-jlayton@redhat.com \
--to=jlayton@redhat.com \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=michael.brantley@deshaw.com \
--cc=miklos@szeredi.hu \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).