diff --git a/[refs] b/[refs]
index 63b547679385..37e31b706cc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a69201d6f08240f20a0d33a1b7273d1e7748791c
+refs/heads/master: 68f1bb8bb89e0bb813c893a42373a26ebdab7f9c
diff --git a/trunk/fs/xattr.c b/trunk/fs/xattr.c
index e21c119f4f99..c5e90d2d751f 100644
--- a/trunk/fs/xattr.c
+++ b/trunk/fs/xattr.c
@@ -370,8 +370,9 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
 {
 	struct path path;
 	int 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 = mnt_want_write(path.mnt);
@@ -380,6 +381,10 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
 		mnt_drop_write(path.mnt);
 	}
 	path_put(&path);
+	if (retry_estale(error, lookup_flags)) {
+		lookup_flags |= LOOKUP_REVAL;
+		goto retry;
+	}
 	return error;
 }