From b34bb18ef343b9ce4438b0eaac14ddaadddec9ba Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Tue, 11 Dec 2012 12:10:13 -0500
Subject: [PATCH] --- yaml --- r: 347855 b: refs/heads/master c:
 14ff690c0f94cf2e37f7c448f4f09bf0b4006d62 h: refs/heads/master i:   347853:
 d1c0f7e9a4adf1fdaec5b4aa17a4fce85436e2a7   347851:
 bf4d7ade4bcdcda602ca91d1d21a2c60919f0763   347847:
 6eba118e5ca6c514842a902a6c82e25cfabf8e6b   347839:
 829ff6e9dd801c902bcf1abb00d18fa53003ff49 v: v3

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

diff --git a/[refs] b/[refs]
index ed0ef469d074..e79521711036 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2771261ec5b677a38f0cd5fcfc6cefd5393787ef
+refs/heads/master: 14ff690c0f94cf2e37f7c448f4f09bf0b4006d62
diff --git a/trunk/fs/open.c b/trunk/fs/open.c
index a13a54d3e691..99c3ce5f897b 100644
--- a/trunk/fs/open.c
+++ b/trunk/fs/open.c
@@ -514,11 +514,16 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename, umode_t, mode
 {
 	struct path path;
 	int error;
-
-	error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path);
+	unsigned int lookup_flags = LOOKUP_FOLLOW;
+retry:
+	error = user_path_at(dfd, filename, lookup_flags, &path);
 	if (!error) {
 		error = chmod_common(&path, mode);
 		path_put(&path);
+		if (retry_estale(error, lookup_flags)) {
+			lookup_flags |= LOOKUP_REVAL;
+			goto retry;
+		}
 	}
 	return error;
 }