NFSv4: Initialise connection to the server in nfs4_alloc_client()
PATCH 1/1 NFSv4: Initialise connection to the server in nfs4_alloc_client()
From: Trond Myklebust <[email protected]>
commit dd99e9f98fbf423ff6d365b37a98e8879170f17c upstream.
Set up the connection to the NFSv4 server in nfs4_alloc_client(), before we've added the struct nfs_client to the net-namespace's nfs_client_list so that a downed server won't cause other mounts to hang in the trunking detection code.
Reported-by Michael Wakabayashi <[email protected]>
Fixes 5c6e5b60aae4 ("NFS: Fix an Oops in the pNFS files and flexfiles connection setup to the DS")
Signed-off-by Trond Myklebust <[email protected]>
[bwh: Backported to 4.9: adjust context]
Signed-off-by Ben Hutchings <[email protected]>
--- fs/nfs/nfs4client.c | 82 +++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 40 deletions(-)
fs/nfs/nfs4client.c +42 -40
@@ -177,8 +177,11 @@ void nfs40_shutdown_client(struct nfs_client *clp)struct nfs_client *nfs4_alloc_client (const struct nfs_client_initdata *cl_init) { -int err; +char buf[INET6_ADDRSTRLEN +1 ]; +const char *ip_addr = cl_init->ip_addr;struct nfs_client *clp =nfs_alloc_client (cl_init); +int err; +if (IS_ERR (clp))return clp;
@@ -202,6 +205,44 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)#if IS_ENABLED (CONFIG_NFS_V4_1 )init_waitqueue_head (&clp->cl_lock_waitq);#endif + +if (cl_init->minorversion !=0 ) +__set_bit (NFS_CS_INFINITE_SLOTS , &clp->cl_flags); +__set_bit (NFS_CS_DISCRTRY , &clp->cl_flags); +__set_bit (NFS_CS_NO_RETRANS_TIMEOUT , &clp->cl_flags); + +/* +* Set up the connection to the server before we add add to the +* global list. +*/ + err =nfs_create_rpc_client (clp, cl_init,RPC_AUTH_GSS_KRB5I ); +if (err == -EINVAL ) + err =nfs_create_rpc_client (clp, cl_init,RPC_AUTH_UNIX ); +if (err <0 ) + goto error; + +/* If no clientaddr= option was specified, find a usable cb address */ +if (ip_addr ==NULL ) { +struct sockaddr_storage cb_addr; +struct sockaddr *sap = (struct sockaddr *)&cb_addr; + + err =rpc_localaddr (clp->cl_rpcclient, sap,sizeof (cb_addr)); +if (err <0 ) + goto error; + err =rpc_ntop (sap, buf,sizeof (buf)); +if (err <0 ) + goto error; + ip_addr = (const char *)buf; + } +strlcpy (clp->cl_ipaddr, ip_addr,sizeof (clp->cl_ipaddr)); + + err =nfs_idmap_new (clp); +if (err <0 ) { +dprintk ("%s: failed to create idmapper. Error = %d\n" , + __func__, err); + goto error; + } +__set_bit (NFS_CS_IDMAP , &clp->cl_res_state);return clp; error:
@@ -354,8 +395,6 @@ static int nfs4_init_client_minor_version(struct nfs_client *clp)struct nfs_client *nfs4_init_client (struct nfs_client *clp,const struct nfs_client_initdata *cl_init) { -char buf[INET6_ADDRSTRLEN +1 ]; -const char *ip_addr = cl_init->ip_addr;struct nfs_client *old;int error;
@@ -365,43 +404,6 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp,return clp; } -/* Check NFS protocol revision and initialize RPC op vector */ - clp->rpc_ops = &nfs_v4_clientops; - -if (clp->cl_minorversion !=0 ) -__set_bit (NFS_CS_INFINITE_SLOTS , &clp->cl_flags); -__set_bit (NFS_CS_DISCRTRY , &clp->cl_flags); -__set_bit (NFS_CS_NO_RETRANS_TIMEOUT , &clp->cl_flags); - - error =nfs_create_rpc_client (clp, cl_init,RPC_AUTH_GSS_KRB5I ); -if (error == -EINVAL ) - error =nfs_create_rpc_client (clp, cl_init,RPC_AUTH_UNIX ); -if (error <0 ) - goto error; - -/* If no clientaddr= option was specified, find a usable cb address */ -if (ip_addr ==NULL ) { -struct sockaddr_storage cb_addr; -struct sockaddr *sap = (struct sockaddr *)&cb_addr; - - error =rpc_localaddr (clp->cl_rpcclient, sap,sizeof (cb_addr)); -if (error <0 ) - goto error; - error =rpc_ntop (sap, buf,sizeof (buf)); -if (error <0 ) - goto error; - ip_addr = (const char *)buf; - } -strlcpy (clp->cl_ipaddr, ip_addr,sizeof (clp->cl_ipaddr)); - - error =nfs_idmap_new (clp); -if (error <0 ) { -dprintk ("%s: failed to create idmapper. Error = %d\n" , - __func__, error); - goto error; - } -__set_bit (NFS_CS_IDMAP , &clp->cl_res_state); - error =nfs4_init_client_minor_version (clp);if (error <0 ) goto error;