1 files changed, 56 insertions, 16 deletions

diff --git a/fs/xattr.c b/fs/xattr.c
index e21c119f4f99..3377dff18404 100644
--- a/fs/xattr.c
+++ b/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;
 }
 
@@ -389,8 +394,9 @@ SYSCALL_DEFINE5(lsetxattr, 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);
@@ -399,6 +405,10 @@ SYSCALL_DEFINE5(lsetxattr, 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;
 }
 
@@ -476,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;
 }
 
@@ -490,12 +505,17 @@ SYSCALL_DEFINE4(lgetxattr, const char __user *, pathname,
 {
         struct path path;
         ssize_t 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 = getxattr(path.dentry, name, value, size);
         path_put(&path);
+        if (retry_estale(error, lookup_flags)) {
+                lookup_flags |= LOOKUP_REVAL;
+                goto retry;
+        }
         return error;
 }
 
@@ -556,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;
 }
 
@@ -570,12 +595,17 @@ SYSCALL_DEFINE3(llistxattr, const char __user *, pathname, char __user *, list,
 {
         struct path path;
         ssize_t 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 = listxattr(path.dentry, list, size);
         path_put(&path);
+        if (retry_estale(error, lookup_flags)) {
+                lookup_flags |= LOOKUP_REVAL;
+                goto retry;
+        }
         return error;
 }
 
@@ -615,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);
@@ -625,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;
 }
 
@@ -633,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);
@@ -643,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;
 }