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, michael.brantley@deshaw.com,
hch@infradead.org, miklos@szeredi.hu, pstaubach@exagrid.com
Subject: [PATCH v4 03/17] vfs: make fstatat retry on ESTALE errors from getattr call
Date: Thu, 26 Jul 2012 07:55:06 -0400 [thread overview]
Message-ID: <1343303720-11199-4-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1343303720-11199-1-git-send-email-jlayton@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
fs/namei.c | 2 +-
fs/stat.c | 21 ++++++++++++++++-----
include/linux/fs.h | 1 +
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index b6fbe3d..1ab4400 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -117,7 +117,7 @@
* POSIX.1 2.4: an empty pathname is invalid (ENOENT).
* PATH_MAX includes the nul terminator --RR.
*/
-static char *getname_flags(const char __user *filename, int flags, int *empty)
+char *getname_flags(const char __user *filename, int flags, int *empty)
{
char *result = __getname(), *err;
int len;
diff --git a/fs/stat.c b/fs/stat.c
index b6ff118..5afeb37 100644
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -72,9 +72,11 @@ EXPORT_SYMBOL(vfs_fstat);
int vfs_fstatat(int dfd, const char __user *filename, struct kstat *stat,
int flag)
{
+ char *name;
struct path path;
int error = -EINVAL;
- int lookup_flags = 0;
+ unsigned int try = 0;
+ unsigned int lookup_flags = 0;
if ((flag & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT |
AT_EMPTY_PATH)) != 0)
@@ -85,12 +87,21 @@ int vfs_fstatat(int dfd, const char __user *filename, struct kstat *stat,
if (flag & AT_EMPTY_PATH)
lookup_flags |= LOOKUP_EMPTY;
- error = user_path_at(dfd, filename, lookup_flags, &path);
- if (error)
+ name = getname_flags(filename, lookup_flags, NULL);
+ if (IS_ERR(name)) {
+ error = PTR_ERR(name);
goto out;
+ }
+ do {
+ error = kern_path_at(dfd, name, lookup_flags, &path);
+ if (error)
+ break;
- error = vfs_getattr(path.mnt, path.dentry, stat);
- path_put(&path);
+ error = vfs_getattr(path.mnt, path.dentry, stat);
+ path_put(&path);
+ lookup_flags |= LOOKUP_REVAL;
+ } while (retry_estale(error, try++));
+ putname(name);
out:
return error;
}
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 138d93a..00db714 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2062,6 +2062,7 @@ extern struct file *file_open_root(struct dentry *, struct vfsmount *,
const char *, int);
extern struct file * dentry_open(const struct path *, int, const struct cred *);
extern int filp_close(struct file *, fl_owner_t id);
+extern char *getname_flags(const char __user *, int, int *);
extern char * getname(const char __user *);
enum {
FILE_CREATED = 1,
--
1.7.11.2
next prev parent reply other threads:[~2012-07-26 11:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-26 11:55 [PATCH v4 00/17] vfs: add the ability to retry on ESTALE to several syscalls Jeff Layton
2012-07-26 11:55 ` [PATCH v4 01/17] vfs: add a retry_estale helper function to handle retries on ESTALE Jeff Layton
2012-07-26 11:55 ` Jeff Layton [this message]
2012-07-26 11:55 ` [PATCH v4 04/17] vfs: fix readlinkat to retry " Jeff Layton
2012-07-26 11:55 ` [PATCH v4 05/17] vfs: remove user_path_at_empty Jeff Layton
2012-07-26 11:55 ` [PATCH v4 06/17] vfs: turn "empty" arg in getname_flags into a bool Jeff Layton
2012-07-26 11:55 ` [PATCH v4 07/17] vfs: add new "reval" argument to kern_path_create Jeff Layton
2012-07-26 11:55 ` [PATCH v4 08/17] vfs: fix mknodat to retry on ESTALE errors Jeff Layton
2012-07-26 11:55 ` [PATCH v4 09/17] vfs: fix mkdir " Jeff Layton
2012-07-26 11:55 ` [PATCH v4 10/17] vfs: fix symlinkat " Jeff Layton
2012-07-26 11:55 ` [PATCH v4 11/17] vfs: fix linkat " Jeff Layton
2012-07-26 11:55 ` [PATCH v4 12/17] vfs: make rmdir " Jeff Layton
2012-07-26 11:55 ` [PATCH v4 13/17] vfs: make do_unlinkat " Jeff Layton
2012-07-26 11:55 ` [PATCH v4 14/17] vfs: fix renameat to " Jeff Layton
2012-07-26 11:55 ` [PATCH v4 16/17] vfs: have do_sys_truncate retry once on an ESTALE error Jeff Layton
[not found] ` <1343303720-11199-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2012-07-26 11:55 ` [PATCH v4 02/17] vfs: add a kern_path_at function Jeff Layton
2012-07-26 11:55 ` [PATCH v4 15/17] vfs: remove user_path_parent Jeff Layton
2012-07-26 11:55 ` [PATCH v4 17/17] vfs: have faccessat retry once on an ESTALE error Jeff Layton
2012-07-27 2:15 ` [PATCH v4 00/17] vfs: add the ability to retry on ESTALE to several syscalls Namjae Jeon
[not found] ` <CAKYAXd99VMYSX=k9eadB6MZvjQjQrOngOjUicjo+c9LtHvpz9w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-07-27 10:56 ` Jeff Layton
[not found] ` <20120727065630.0a3c5870-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
2012-08-01 1:52 ` Namjae Jeon
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=1343303720-11199-4-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=pstaubach@exagrid.com \
--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).