From: Jeff Layton <jlayton@redhat.com>
To: viro@ZenIV.linux.org.uk
Cc: inux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org,
linux-kernel@vger.kernel.org, miklos@szeredi.hu,
hch@infradead.org, michael.brantley@deshaw.com,
pstaubach@exagrid.com
Subject: [PATCH v2 04/15] vfs: fix readlinkat to retry on ESTALE
Date: Tue, 22 May 2012 10:12:08 -0400 [thread overview]
Message-ID: <1337695939-2741-5-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1337695939-2741-1-git-send-email-jlayton@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
fs/stat.c | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/fs/stat.c b/fs/stat.c
index 60a8813..671106d 100644
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -307,14 +307,25 @@ SYSCALL_DEFINE4(readlinkat, int, dfd, const char __user *, pathname,
struct path path;
int error;
int empty = 0;
+ char *name;
+ unsigned int try = 0;
+ unsigned int lookup_flags = LOOKUP_EMPTY;
if (bufsiz <= 0)
return -EINVAL;
- error = user_path_at_empty(dfd, pathname, LOOKUP_EMPTY, &path, &empty);
- if (!error) {
- struct inode *inode = path.dentry->d_inode;
+ name = getname_flags(pathname, lookup_flags, &empty);
+ if (IS_ERR(name))
+ return PTR_ERR(name);
+
+ do {
+ struct inode *inode;
+
+ error = kern_path_at(dfd, name, lookup_flags, &path);
+ if (error)
+ break;
+ inode = path.dentry->d_inode;
error = empty ? -ENOENT : -EINVAL;
if (inode->i_op->readlink) {
error = security_inode_readlink(path.dentry);
@@ -325,7 +336,9 @@ SYSCALL_DEFINE4(readlinkat, int, dfd, const char __user *, pathname,
}
}
path_put(&path);
- }
+ lookup_flags |= LOOKUP_REVAL;
+ } while (retry_estale(error, try++));
+ putname(name);
return error;
}
--
1.7.7.6
next prev parent reply other threads:[~2012-05-22 14:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-22 14:12 [PATCH v2 00/15] vfs: add the ability to retry on ESTALE to several syscalls Jeff Layton
2012-05-22 14:12 ` [PATCH v2 01/15] vfs: add a retry_estale helper function to handle retries on ESTALE Jeff Layton
2012-05-22 14:12 ` [PATCH v2 02/15] vfs: add a kern_path_at function Jeff Layton
2012-05-22 14:12 ` [PATCH v2 03/15] vfs: make fstatat retry on ESTALE errors from getattr call Jeff Layton
2012-05-22 14:12 ` Jeff Layton [this message]
2012-05-22 14:12 ` [PATCH v2 05/15] vfs: remove user_path_at_empty Jeff Layton
2012-05-22 14:12 ` [PATCH v2 06/15] vfs: turn "empty" arg in getname_flags into a bool Jeff Layton
2012-05-22 14:12 ` [PATCH v2 07/15] vfs: add new "reval" argument to kern_path_create Jeff Layton
2012-05-22 14:12 ` [PATCH v2 08/15] vfs: fix mknodat to retry on ESTALE errors Jeff Layton
2012-05-22 14:12 ` [PATCH v2 09/15] vfs: fix mkdir " Jeff Layton
2012-05-22 14:12 ` [PATCH v2 10/15] vfs: fix symlinkat " Jeff Layton
2012-05-22 14:12 ` [PATCH v2 11/15] vfs: fix linkat " Jeff Layton
2012-05-22 14:12 ` [PATCH v2 12/15] vfs: make rmdir " Jeff Layton
2012-05-22 14:12 ` [PATCH v2 13/15] vfs: make do_unlinkat " Jeff Layton
2012-05-22 14:12 ` [PATCH v2 14/15] vfs: fix renameat to " Jeff Layton
2012-05-22 14:12 ` [PATCH v2 15/15] vfs: remove user_path_parent 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=1337695939-2741-5-git-send-email-jlayton@redhat.com \
--to=jlayton@redhat.com \
--cc=hch@infradead.org \
--cc=inux-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).