Skip to content

Commit 698c937

Browse files
committed
NFSv4: Clean up lookup of SECINFO_NO_NAME
Use the minor version ops cached in struct nfs_client instead of looking them up again. Signed-off-by: Trond Myklebust <[email protected]>
1 parent 6fdf339 commit 698c937

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

fs/nfs/nfs4proc.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3281,13 +3281,6 @@ static int nfs4_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,
32813281
return status;
32823282
}
32833283

3284-
static int nfs4_do_find_root_sec(struct nfs_server *server,
3285-
struct nfs_fh *fhandle, struct nfs_fsinfo *info)
3286-
{
3287-
int mv = server->nfs_client->cl_minorversion;
3288-
return nfs_v4_minor_ops[mv]->find_root_sec(server, fhandle, info);
3289-
}
3290-
32913284
/**
32923285
* nfs4_proc_get_rootfh - get file handle for server's pseudoroot
32933286
* @server: initialized nfs_server handle
@@ -3307,7 +3300,8 @@ int nfs4_proc_get_rootfh(struct nfs_server *server, struct nfs_fh *fhandle,
33073300
status = nfs4_lookup_root(server, fhandle, info);
33083301

33093302
if (auth_probe || status == NFS4ERR_WRONGSEC)
3310-
status = nfs4_do_find_root_sec(server, fhandle, info);
3303+
status = server->nfs_client->cl_mvops->find_root_sec(server,
3304+
fhandle, info);
33113305

33123306
if (status == 0)
33133307
status = nfs4_server_capabilities(server, fhandle);

0 commit comments

Comments
 (0)