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 v9 10/34] vfs: make rmdir retry on ESTALE errors
Date: Mon, 5 Nov 2012 10:21:49 -0500 [thread overview]
Message-ID: <1352128933-28526-11-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1352128933-28526-1-git-send-email-jlayton@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
fs/namei.c | 79 +++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 42 insertions(+), 37 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 1569ccd..0b70e6d 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3344,49 +3344,54 @@ static long do_rmdir(int dfd, const char __user *pathname)
struct filename *name;
struct dentry *dentry;
struct nameidata nd;
+ unsigned int try = 0;
- name = user_path_parent(dfd, pathname, &nd, 0);
- 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 {
+ name = user_path_parent(dfd, pathname, &nd, try);
+ 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;
+ }
- nd.flags &= ~LOOKUP_PARENT;
- error = mnt_want_write(nd.path.mnt);
- if (error)
- goto exit1;
+ nd.flags &= ~LOOKUP_PARENT;
+ error = mnt_want_write(nd.path.mnt);
+ if (error)
+ 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 = security_path_rmdir(&nd.path, dentry);
- if (error)
- goto exit3;
- error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
+ mutex_lock_nested(&nd.path.dentry->d_inode->i_mutex,
+ I_MUTEX_PARENT);
+ dentry = lookup_hash(&nd);
+ if (IS_ERR(dentry)) {
+ error = PTR_ERR(dentry);
+ goto exit2;
+ }
+ if (!dentry->d_inode) {
+ error = -ENOENT;
+ goto exit3;
+ }
+ error = security_path_rmdir(&nd.path, dentry);
+ if (error)
+ goto exit3;
+ error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
exit3:
- dput(dentry);
+ dput(dentry);
exit2:
- mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
- mnt_drop_write(nd.path.mnt);
+ mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
+ mnt_drop_write(nd.path.mnt);
exit1:
- path_put(&nd.path);
- putname(name);
+ path_put(&nd.path);
+ putname(name);
+ } while (retry_estale(error, try++));
return error;
}
--
1.7.11.7
next prev parent reply other threads:[~2012-11-05 15:21 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-05 15:21 [PATCH v9 00/34] vfs: add the ability to retry lookup and operation to most path-based syscalls Jeff Layton
2012-11-05 15:21 ` [PATCH v9 01/34] vfs: add a retry_estale helper function to handle retries on ESTALE Jeff Layton
2012-11-05 15:21 ` [PATCH v9 02/34] vfs: make fstatat retry on ESTALE errors from getattr call Jeff Layton
2012-11-05 15:21 ` [PATCH v9 03/34] vfs: fix readlinkat to retry on ESTALE Jeff Layton
[not found] ` <1352128933-28526-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2012-11-05 15:21 ` [PATCH v9 04/34] vfs: add new "reval" argument to kern_path_create and user_path_create Jeff Layton
2012-11-05 15:21 ` [PATCH v9 11/34] vfs: make do_unlinkat retry on ESTALE errors Jeff Layton
2012-11-05 15:22 ` [PATCH v9 34/34] vfs: add a sliding backoff delay between ESTALE retries Jeff Layton
2012-11-05 15:21 ` [PATCH v9 05/34] vfs: fix mknodat to retry on ESTALE errors Jeff Layton
2012-11-05 15:21 ` [PATCH v9 06/34] vfs: fix mkdir " Jeff Layton
2012-11-05 15:21 ` [PATCH v9 07/34] vfs: fix symlinkat " Jeff Layton
2012-11-05 15:21 ` [PATCH v9 08/34] vfs: fix linkat " Jeff Layton
2012-11-05 15:21 ` [PATCH v9 09/34] vfs: add a reval argument to user_path_parent Jeff Layton
2012-11-05 15:21 ` Jeff Layton [this message]
2012-11-05 15:21 ` [PATCH v9 12/34] vfs: fix renameat to retry on ESTALE errors Jeff Layton
2012-11-05 15:21 ` [PATCH v9 13/34] vfs: have do_sys_truncate retry once on an ESTALE error Jeff Layton
2012-11-05 15:21 ` [PATCH v9 14/34] vfs: have faccessat " Jeff Layton
2012-11-05 15:21 ` [PATCH v9 15/34] vfs: have chdir retry lookup and call once on " Jeff Layton
2012-11-05 15:21 ` [PATCH v9 16/34] vfs: make chroot retry " Jeff Layton
2012-11-05 15:21 ` [PATCH v9 17/34] vfs: make fchmodat retry once on ESTALE errors Jeff Layton
2012-11-05 15:21 ` [PATCH v9 18/34] vfs: make fchownat " Jeff Layton
2012-11-05 15:21 ` [PATCH v9 19/34] vfs: fix user_statfs to " Jeff Layton
2012-11-05 15:21 ` [PATCH v9 20/34] vfs: allow utimensat() calls to retry once on an ESTALE error Jeff Layton
2012-11-05 15:22 ` [PATCH v9 21/34] vfs: allow setxattr to retry once on ESTALE errors Jeff Layton
2012-11-05 15:22 ` [PATCH v9 22/34] vfs: allow lsetxattr() " Jeff Layton
2012-11-05 15:22 ` [PATCH v9 23/34] vfs: make getxattr retry once on an ESTALE error Jeff Layton
2012-11-05 15:22 ` [PATCH v9 24/34] vfs: make lgetxattr retry once on ESTALE Jeff Layton
2012-11-05 15:22 ` [PATCH v9 25/34] vfs: make listxattr retry once on ESTALE error Jeff Layton
2012-11-05 15:22 ` [PATCH v9 26/34] vfs: make llistxattr " Jeff Layton
2012-11-05 15:22 ` [PATCH v9 27/34] vfs: make removexattr retry once on ESTALE Jeff Layton
2012-11-05 15:22 ` [PATCH v9 28/34] vfs: make lremovexattr retry once on ESTALE error Jeff Layton
2012-11-05 15:22 ` [PATCH v9 29/34] vfs: convert do_filp_open to use retry_estale helper Jeff Layton
2012-11-05 15:22 ` [PATCH v9 30/34] vfs: convert do_file_open_root " Jeff Layton
2012-11-05 15:22 ` [PATCH v9 31/34] vfs: convert filename_lookup " Jeff Layton
2012-11-05 15:22 ` [PATCH v9 32/34] vfs: ensure that forward progress is being made on pathwalks Jeff Layton
2012-11-05 15:22 ` [PATCH v9 33/34] vfs: make number of ESTALE retries tunable 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=1352128933-28526-11-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).