Commit 90a16617 authored by Andy Adamson's avatar Andy Adamson Committed by Benny Halevy
Browse files

nfs41: add a get_clid_cred function to nfs4_state_recovery_ops 



EXCHANGE_ID has different credential requirements than SETCLIENTID.
Prepare for a separate credential function.

Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 591d71cb

fs/nfs/nfs4_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ struct nfs4_state_recovery_ops { 
	int (*recover_open)(struct nfs4_state_owner *, struct nfs4_state *);

	int (*recover_lock)(struct nfs4_state *, struct file_lock *);

	int (*establish_clid)(struct nfs_client *, struct rpc_cred *);

	struct rpc_cred * (*get_clid_cred)(struct nfs_client *);

};



struct nfs4_state_maintenance_ops {

fs/nfs/nfs4proc.c

+2 −0
Original line number Diff line number Diff line
@@ -4786,6 +4786,7 @@ struct nfs4_state_recovery_ops nfs40_reboot_recovery_ops = { 
	.recover_open	= nfs4_open_reclaim,

	.recover_lock	= nfs4_lock_reclaim,

	.establish_clid = nfs4_init_clientid,

	.get_clid_cred	= nfs4_get_setclientid_cred,

};



#if defined(CONFIG_NFS_V4_1)
@@ -4804,6 +4805,7 @@ struct nfs4_state_recovery_ops nfs40_nograce_recovery_ops = { 
	.recover_open	= nfs4_open_expired,

	.recover_lock	= nfs4_lock_expired,

	.establish_clid = nfs4_init_clientid,

	.get_clid_cred	= nfs4_get_setclientid_cred,

};



#if defined(CONFIG_NFS_V4_1)

fs/nfs/nfs4state.c

+1 −1
Original line number Diff line number Diff line
@@ -1102,7 +1102,7 @@ static int nfs4_reclaim_lease(struct nfs_client *clp) 
		nfs4_reboot_recovery_ops[clp->cl_minorversion];

	int status = -ENOENT;



	cred = nfs4_get_setclientid_cred(clp);

	cred = ops->get_clid_cred(clp);

	if (cred != NULL) {

		status = ops->establish_clid(clp, cred);

		put_rpccred(cred);