NFSv4.1: Fix an Oops in nfs41_walk_client_list

[firefly-linux-kernel-4.4.55.git] / fs / statfs.c

diff --git a/fs/statfs.c b/fs/statfs.c
index f8e832e6f0a2220d0e16163b230ad0f710ee4132..083dc0ac91408870254cac60ed4b06580deba610 100644 (file)
--- a/fs/statfs.c
+++ b/fs/statfs.c
@@ -77,17 +77,24 @@ EXPORT_SYMBOL(vfs_statfs);
 int user_statfs(const char __user *pathname, struct kstatfs *st)
 {
        struct path path;
-       int error = user_path_at(AT_FDCWD, pathname, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &path);
+       int error;
+       unsigned int lookup_flags = LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT;
+retry:
+       error = user_path_at(AT_FDCWD, pathname, lookup_flags, &path);
        if (!error) {
                error = vfs_statfs(&path, st);
                path_put(&path);
+               if (retry_estale(error, lookup_flags)) {
+                       lookup_flags |= LOOKUP_REVAL;
+                       goto retry;
+               }
        }
        return error;
 }
 
 int fd_statfs(int fd, struct kstatfs *st)
 {
-       struct fd f = fdget(fd);
+       struct fd f = fdget_raw(fd);
        int error = -EBADF;
        if (f.file) {
                error = vfs_statfs(&f.file->f_path, st);