diff --git a/[refs] b/[refs]
index 9ef021d04776..793b3d4787ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd9bbc9842bde1b14046cdbda1153f0d49061135
+refs/heads/master: 12f06212990400db1b54bd7b49b7f6f5f1b32469
diff --git a/trunk/fs/xattr.c b/trunk/fs/xattr.c
index 49d09e158809..4caa8efeada3 100644
--- a/trunk/fs/xattr.c
+++ b/trunk/fs/xattr.c
@@ -645,8 +645,9 @@ SYSCALL_DEFINE2(removexattr, 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);
@@ -655,6 +656,10 @@ SYSCALL_DEFINE2(removexattr, 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;
 }