Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6663ee7f authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Create an alloc_client rpc_op 



This gives NFS v4 a way to set up callbacks and sessions without v2 or
v3 having to do them as well.

Signed-off-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent cdb7eced

fs/nfs/client.c

+26 −14
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ struct nfs_client_initdata { 
 * Since these are allocated/deallocated very rarely, we don't

 * bother putting them in a slab cache...

 */

static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init)

struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init)

{

	struct nfs_client *clp;

	struct rpc_cred *cred;
@@ -177,18 +177,6 @@ static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_ 
	clp->cl_proto = cl_init->proto;

	clp->cl_net = get_net(cl_init->net);



#ifdef CONFIG_NFS_V4

	err = nfs_get_cb_ident_idr(clp, cl_init->minorversion);

	if (err)

		goto error_cleanup;



	spin_lock_init(&clp->cl_lock);

	INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state);

	rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client");

	clp->cl_state = 1 << NFS4CLNT_LEASE_EXPIRED;

	clp->cl_minorversion = cl_init->minorversion;

	clp->cl_mvops = nfs_v4_minor_ops[cl_init->minorversion];

#endif

	cred = rpc_lookup_machine_cred("*");

	if (!IS_ERR(cred))

		clp->cl_machine_cred = cred;
@@ -218,6 +206,30 @@ static void nfs4_shutdown_session(struct nfs_client *clp) 
}

#endif /* CONFIG_NFS_V4_1 */



struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)

{

	int err;

	struct nfs_client *clp = nfs_alloc_client(cl_init);

	if (IS_ERR(clp))

		return clp;



	err = nfs_get_cb_ident_idr(clp, cl_init->minorversion);

	if (err)

		goto error;



	spin_lock_init(&clp->cl_lock);

	INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state);

	rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client");

	clp->cl_state = 1 << NFS4CLNT_LEASE_EXPIRED;

	clp->cl_minorversion = cl_init->minorversion;

	clp->cl_mvops = nfs_v4_minor_ops[cl_init->minorversion];

	return clp;



error:

	kfree(clp);

	return ERR_PTR(err);

}



/*

 * Destroy the NFS4 callback service

 */
@@ -588,7 +600,7 @@ nfs_get_client(const struct nfs_client_initdata *cl_init, 


		spin_unlock(&nn->nfs_client_lock);



		new = nfs_alloc_client(cl_init);

		new = cl_init->rpc_ops->alloc_client(cl_init);

	} while (!IS_ERR(new));



	dprintk("<-- nfs_get_client() Failed to find %s (%ld)\n",

fs/nfs/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ extern void nfs_umount(const struct nfs_mount_request *info); 
/* client.c */

extern const struct rpc_program nfs_program;

extern void nfs_clients_init(struct net *net);

extern struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *);



extern void nfs_cleanup_cb_ident_idr(struct net *);

extern void nfs_put_client(struct nfs_client *);

fs/nfs/nfs3proc.c

+1 −0
Original line number Diff line number Diff line
@@ -934,6 +934,7 @@ const struct nfs_rpc_ops nfs_v3_clientops = { 
	.close_context	= nfs_close_context,

	.have_delegation = nfs3_have_delegation,

	.return_delegation = nfs3_return_delegation,

	.alloc_client	= nfs_alloc_client,

	.init_client	= nfs_init_client,

	.free_client	= nfs_free_client,

};

fs/nfs/nfs4_fs.h

+2 −0
Original line number Diff line number Diff line
@@ -303,6 +303,8 @@ extern const u32 nfs4_fs_locations_bitmap[2]; 


void nfs4_free_client(struct nfs_client *);



struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *);



/* nfs4renewd.c */

extern void nfs4_schedule_state_renewal(struct nfs_client *);

extern void nfs4_renewd_prepare_shutdown(struct nfs_server *);

fs/nfs/nfs4proc.c

+1 −0
Original line number Diff line number Diff line
@@ -6806,6 +6806,7 @@ const struct nfs_rpc_ops nfs_v4_clientops = { 
	.open_context	= nfs4_atomic_open,

	.have_delegation = nfs4_have_delegation,

	.return_delegation = nfs4_inode_return_delegation,

	.alloc_client	= nfs4_alloc_client,

	.init_client	= nfs4_init_client,

	.free_client	= nfs4_free_client,

};