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 12/15] vfs: make rmdir retry on ESTALE errors
Date: Tue, 22 May 2012 10:12:16 -0400 [thread overview]
Message-ID: <1337695939-2741-13-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/namei.c | 82 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 46 insertions(+), 36 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 402f469..a11fcc7 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2778,52 +2778,62 @@ out:
static long do_rmdir(int dfd, const char __user *pathname)
{
int error = 0;
- char * name;
+ char *name;
struct dentry *dentry;
struct nameidata nd;
+ unsigned int try = 0;
+ unsigned int lookup_flags = LOOKUP_PARENT;
- error = user_path_parent(dfd, pathname, &nd, &name);
- if (error)
- return error;
+ name = getname(pathname);
+ if (IS_ERR(name))
+ return PTR_ERR(name);
- switch(nd.last_type) {
- case LAST_DOTDOT:
- error = -ENOTEMPTY;
- goto exit1;
- case LAST_DOT:
- error = -EINVAL;
- goto exit1;
- case LAST_ROOT:
- error = -EBUSY;
- goto exit1;
- }
+ do {
+ error = do_path_lookup(dfd, name, lookup_flags, &nd);
+ if (error)
+ break;
- nd.flags &= ~LOOKUP_PARENT;
+ switch (nd.last_type) {
+ case LAST_DOTDOT:
+ error = -ENOTEMPTY;
+ goto exit1;
+ case LAST_DOT:
+ error = -EINVAL;
+ goto exit1;
+ case LAST_ROOT:
+ error = -EBUSY;
+ goto exit1;
+ }
- mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex, I_MUTEX_PARENT);
- dentry = lookup_hash(&nd);
- error = PTR_ERR(dentry);
- if (IS_ERR(dentry))
- goto exit2;
- if (!dentry->d_inode) {
- error = -ENOENT;
- goto exit3;
- }
- error = mnt_want_write(nd.path.mnt);
- if (error)
- goto exit3;
- error = security_path_rmdir(&nd.path, dentry);
- if (error)
- goto exit4;
- error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
+ nd.flags &= ~LOOKUP_PARENT;
+
+ mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex,
+ I_MUTEX_PARENT);
+ dentry = lookup_hash(&nd);
+ error = PTR_ERR(dentry);
+ if (IS_ERR(dentry))
+ goto exit2;
+ if (!dentry->d_inode) {
+ error = -ENOENT;
+ goto exit3;
+ }
+ error = mnt_want_write(nd.path.mnt);
+ if (error)
+ goto exit3;
+ error = security_path_rmdir(&nd.path, dentry);
+ if (error)
+ goto exit4;
+ error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
exit4:
- mnt_drop_write(nd.path.mnt);
+ mnt_drop_write(nd.path.mnt);
exit3:
- dput(dentry);
+ dput(dentry);
exit2:
- mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
+ mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
exit1:
- path_put(&nd.path);
+ path_put(&nd.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 ` [PATCH v2 04/15] vfs: fix readlinkat to retry on ESTALE Jeff Layton
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 ` Jeff Layton [this message]
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-13-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).