linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 RESEND 08/12] vfs: make rmdir retry on ESTALE errors
Date: Mon,  7 May 2012 10:12:07 -0400	[thread overview]
Message-ID: <1336399931-20234-9-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1336399931-20234-1-git-send-email-jlayton@redhat.com>

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 fs/namei.c |   76 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index c8254de..58f5eae 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2762,50 +2762,54 @@ static long do_rmdir(int dfd, const char __user *pathname)
 	char * name;
 	struct dentry *dentry;
 	struct nameidata nd;
+	unsigned int try = 0;
 
-	error = user_path_parent(dfd, pathname, &nd, &name, false);
-	if (error)
-		return error;
+	do {
+		error = user_path_parent(dfd, pathname, &nd, &name, try);
+		if (error)
+			break;
 
-	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;
-	}
+		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;
+		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);
+		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);
-	putname(name);
+		path_put(&nd.path);
+		putname(name);
+	} while (retry_estale(error, try++));
 	return error;
 }
 
-- 
1.7.7.6


  parent reply	other threads:[~2012-05-07 14:14 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-07 14:11 [PATCH v1 RESEND 00/12] vfs: add the ability to retry on ESTALE to several syscalls Jeff Layton
2012-05-07 14:12 ` [PATCH v1 RESEND 01/12] vfs: add a retry_estale helper function to handle retries on ESTALE Jeff Layton
2012-05-07 14:12 ` [PATCH v1 RESEND 02/12] vfs: make fstatat retry on ESTALE errors from getattr call Jeff Layton
2012-05-07 14:12 ` [PATCH v1 RESEND 03/12] vfs: fix readlinkat to retry on ESTALE Jeff Layton
2012-05-07 14:12 ` [PATCH v1 RESEND 04/12] vfs: add new "reval" argument to kern_path_create and user_path_create Jeff Layton
2012-05-09 10:57   ` Jeff Layton
2012-05-07 14:12 ` [PATCH v1 RESEND 05/12] vfs: fix mknodat to retry on ESTALE errors Jeff Layton
2012-05-07 14:12 ` [PATCH v1 RESEND 06/12] vfs: fix mkdir " Jeff Layton
2012-05-07 14:12 ` [PATCH v1 RESEND 07/12] vfs: add a "reval" flag to args for user_path_parent Jeff Layton
2012-05-07 14:12 ` Jeff Layton [this message]
2012-05-07 14:12 ` [PATCH v1 RESEND 09/12] vfs: make do_unlinkat retry on ESTALE errors Jeff Layton
2012-05-07 14:12 ` [PATCH v1 RESEND 10/12] vfs: fix symlinkat to " Jeff Layton
2012-05-07 14:12 ` [PATCH v1 RESEND 11/12] vfs: fix linkat " Jeff Layton
2012-05-07 14:12 ` [PATCH v1 RESEND 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=1336399931-20234-9-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).