Commit 468d126d authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFS: Fix initialisation of nfs_client cl_flags field 



For some long forgotten reason, the nfs_client cl_flags field is
initialised in nfs_get_client() instead of being initialised at
allocation time. This quirk was harmless until we moved the call to
nfs_create_rpc_client().

Fixes: dd99e9f9 ("NFSv4: Initialise connection to the server in nfs4_alloc_client()")
Cc: stable@vger.kernel.org # 4.8.x
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent e1d2699b

fs/nfs/client.c

+1 −1
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init) 
	INIT_LIST_HEAD(&clp->cl_superblocks);

	clp->cl_rpcclient = ERR_PTR(-EINVAL);



	clp->cl_flags = cl_init->init_flags;

	clp->cl_proto = cl_init->proto;

	clp->cl_nconnect = cl_init->nconnect;

	clp->cl_max_connect = cl_init->max_connect ? cl_init->max_connect : 1;
@@ -423,7 +424,6 @@ struct nfs_client *nfs_get_client(const struct nfs_client_initdata *cl_init) 
			list_add_tail(&new->cl_share_link,

					&nn->nfs_client_list);

			spin_unlock(&nn->nfs_client_lock);

			new->cl_flags = cl_init->init_flags;

			return rpc_ops->init_client(new, cl_init);

		}