NFSv4: Clean up lookup of SECINFO_NO_NAME
authorTrond Myklebust <trond.myklebust@primarydata.com>
Mon, 25 Jul 2016 17:31:14 +0000 (13:31 -0400)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Tue, 26 Jul 2016 14:59:23 +0000 (10:59 -0400)
Use the minor version ops cached in struct nfs_client instead of looking
them up again.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
fs/nfs/nfs4proc.c

index 4b1491da16eb003cb7d21ea5ecf835bec9db9e90..da5c9e58e9075bfb74a682c89e8ccc8961383ec9 100644 (file)
@@ -3281,13 +3281,6 @@ static int nfs4_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,
        return status;
 }
 
-static int nfs4_do_find_root_sec(struct nfs_server *server,
-               struct nfs_fh *fhandle, struct nfs_fsinfo *info)
-{
-       int mv = server->nfs_client->cl_minorversion;
-       return nfs_v4_minor_ops[mv]->find_root_sec(server, fhandle, info);
-}
-
 /**
  * nfs4_proc_get_rootfh - get file handle for server's pseudoroot
  * @server: initialized nfs_server handle
@@ -3307,7 +3300,8 @@ int nfs4_proc_get_rootfh(struct nfs_server *server, struct nfs_fh *fhandle,
                status = nfs4_lookup_root(server, fhandle, info);
 
        if (auth_probe || status == NFS4ERR_WRONGSEC)
-               status = nfs4_do_find_root_sec(server, fhandle, info);
+               status = server->nfs_client->cl_mvops->find_root_sec(server,
+                               fhandle, info);
 
        if (status == 0)
                status = nfs4_server_capabilities(server, fhandle);
This page took 0.026576 seconds and 5 git commands to generate.