diff --git a/[refs] b/[refs]
index 19b09bb61308..754afe784b45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e790bd65ce4cbfdff305a57b67b1a2cbe5d4335
+refs/heads/master: c6ee920698301febdf10df0b57039173a1edbd43
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 19190618695f..fe06a2fd1925 100644
--- a/trunk/fs/namei.c
+++ b/trunk/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 @@ static long do_rmdir(int dfd, const char __user *pathname)
 exit1:
 	path_put(&nd.path);
 	putname(name);
+	if (retry_estale(error, lookup_flags)) {
+		lookup_flags |= LOOKUP_REVAL;
+		goto retry;
+	}
 	return error;
 }