From: Jeff Layton <jlayton@redhat.com>
Date: Thu, 20 Dec 2012 21:28:33 +0000 (-0500)
Subject: vfs: make do_rmdir retry once on ESTALE errors
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c6ee920698301febdf10df0b57039173a1edbd43;p=deliverable%2Flinux.git

vfs: make do_rmdir retry once on ESTALE errors

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/namei.c b/fs/namei.c
index 19190618695f..fe06a2fd1925 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3339,8 +3339,9 @@ static long do_rmdir(int dfd, const char __user *pathname)
 	struct filename *name;
 	struct dentry *dentry;
 	struct nameidata nd;
-
-	name = user_path_parent(dfd, pathname, &nd, 0);
+	unsigned int lookup_flags = 0;
+retry:
+	name = user_path_parent(dfd, pathname, &nd, lookup_flags);
 	if (IS_ERR(name))
 		return PTR_ERR(name);
 
@@ -3382,6 +3383,10 @@ exit2:
 exit1:
 	path_put(&nd.path);
 	putname(name);
+	if (retry_estale(error, lookup_flags)) {
+		lookup_flags |= LOOKUP_REVAL;
+		goto retry;
+	}
 	return error;
 }