diff --git a/[refs] b/[refs]
index b8d095d3ba2e..0de251a9d5e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49e09e1cc576daa99ea22f3a3c699062c34f8c0f
+refs/heads/master: 60e66b48ca20819d97ec4851007accc0b013985a
diff --git a/trunk/fs/xattr.c b/trunk/fs/xattr.c
index 74d36e063c8d..24833de649f8 100644
--- a/trunk/fs/xattr.c
+++ b/trunk/fs/xattr.c
@@ -486,12 +486,17 @@ SYSCALL_DEFINE4(getxattr, const char __user *, pathname,
 {
 	struct path path;
 	ssize_t error;
-
-	error = user_path(pathname, &path);
+	unsigned int lookup_flags = LOOKUP_FOLLOW;
+retry:
+	error = user_path_at(AT_FDCWD, pathname, lookup_flags, &path);
 	if (error)
 		return error;
 	error = getxattr(path.dentry, name, value, size);
 	path_put(&path);
+	if (retry_estale(error, lookup_flags)) {
+		lookup_flags |= LOOKUP_REVAL;
+		goto retry;
+	}
 	return error;
 }