From 8308d784b5716985290a3affe852c5d57fda152d Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Thu, 20 Dec 2012 16:38:04 -0500
Subject: [PATCH] --- yaml --- r: 347849 b: refs/heads/master c:
 5d18f8133cad85ccbb7fa6fd351d75025da32504 h: refs/heads/master i:   347847:
 6eba118e5ca6c514842a902a6c82e25cfabf8e6b v: v3

---
 [refs]           |  2 +-
 trunk/fs/namei.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 754afe784b45..fb25df28c817 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6ee920698301febdf10df0b57039173a1edbd43
+refs/heads/master: 5d18f8133cad85ccbb7fa6fd351d75025da32504
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index fe06a2fd1925..8a262c2efff8 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -3440,8 +3440,9 @@ static long do_unlinkat(int dfd, const char __user *pathname)
 	struct dentry *dentry;
 	struct nameidata nd;
 	struct inode *inode = NULL;
-
-	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);
 
@@ -3479,6 +3480,11 @@ static long do_unlinkat(int dfd, const char __user *pathname)
 exit1:
 	path_put(&nd.path);
 	putname(name);
+	if (retry_estale(error, lookup_flags)) {
+		lookup_flags |= LOOKUP_REVAL;
+		inode = NULL;
+		goto retry;
+	}
 	return error;
 
 slashes: