diff --git a/[refs] b/[refs]
index 793b3d4787ed..57a4e4bfb00a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12f06212990400db1b54bd7b49b7f6f5f1b32469
+refs/heads/master: b729d75d19777a5dd34672020516eada43ff026f
diff --git a/trunk/fs/xattr.c b/trunk/fs/xattr.c
index 4caa8efeada3..3377dff18404 100644
--- a/trunk/fs/xattr.c
+++ b/trunk/fs/xattr.c
@@ -668,8 +668,9 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
 {
 	struct path path;
 	int error;
-
-	error = user_lpath(pathname, &path);
+	unsigned int lookup_flags = 0;
+retry:
+	error = user_path_at(AT_FDCWD, pathname, lookup_flags, &path);
 	if (error)
 		return error;
 	error = mnt_want_write(path.mnt);
@@ -678,6 +679,10 @@ SYSCALL_DEFINE2(lremovexattr, 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;
 }