NFS: Fix infinite loop in gss_create_upcall()

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

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index dfd1e6d7e6c3c645886424f2858d27874233566f..8a03ee0689f38e04f50bc2478d1ef6587c8db1ee 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2204,8 +2204,6 @@ static int nfs4_lookup_root_sec(struct nfs_server *server, struct nfs_fh *fhandl
                goto out;
        }
        ret = nfs4_lookup_root(server, fhandle, info);
-       if (ret < 0)
-               ret = -EAGAIN;
 out:
        return ret;
 }
@@ -2226,8 +2224,9 @@ static int nfs4_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,
 
        for (i = 0; i < len; i++) {
                status = nfs4_lookup_root_sec(server, fhandle, info, flav_array[i]);
-               if (status == 0)
-                       break;
+               if (status == -EPERM || status == -EACCES)
+                       continue;
+               break;
        }
        if (status == 0)
                status = nfs4_server_capabilities(server, fhandle);