diff --git a/[refs] b/[refs]
index 8a28c970d3ec..ebf7576f860f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a3e159dbfe405517584b09bbcefd72115d93342
+refs/heads/master: 10a90cf36efe0fca5c7719fd9b0299abd6be51aa
diff --git a/trunk/fs/xattr.c b/trunk/fs/xattr.c
index c127d57bf655..1dc1eac17319 100644
--- a/trunk/fs/xattr.c
+++ b/trunk/fs/xattr.c
@@ -576,12 +576,17 @@ SYSCALL_DEFINE3(listxattr, const char __user *, pathname, char __user *, list,
 {
 	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 = listxattr(path.dentry, list, size);
 	path_put(&path);
+	if (retry_estale(error, lookup_flags)) {
+		lookup_flags |= LOOKUP_REVAL;
+		goto retry;
+	}
 	return error;
 }