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

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

nfs41: get_clid_cred for EXCHANGE_ID 



Unlike SETCLIENTID, EXCHANGE_ID requires a machine credential. Do not search
for credentials other than the machine credential.

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 90a16617

fs/nfs/nfs4_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ struct rpc_cred *nfs4_get_setclientid_cred(struct nfs_client *clp); 
struct rpc_cred *nfs4_get_renew_cred_locked(struct nfs_client *clp);

#if defined(CONFIG_NFS_V4_1)

struct rpc_cred *nfs4_get_machine_cred_locked(struct nfs_client *clp);

struct rpc_cred *nfs4_get_exchange_id_cred(struct nfs_client *clp);

#endif /* CONFIG_NFS_V4_1 */



extern struct nfs4_state_owner * nfs4_get_state_owner(struct nfs_server *, struct rpc_cred *);

fs/nfs/nfs4proc.c

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

	.recover_lock	= nfs4_lock_reclaim,

	.establish_clid = nfs4_proc_exchange_id,

	.get_clid_cred	= nfs4_get_exchange_id_cred,

};

#endif /* CONFIG_NFS_V4_1 */
@@ -4815,6 +4816,7 @@ struct nfs4_state_recovery_ops nfs41_nograce_recovery_ops = { 
	.recover_open	= nfs4_open_expired,

	.recover_lock	= nfs4_lock_expired,

	.establish_clid = nfs4_proc_exchange_id,

	.get_clid_cred	= nfs4_get_exchange_id_cred,

};

#endif /* CONFIG_NFS_V4_1 */

fs/nfs/nfs4state.c

+14 −0
Original line number Diff line number Diff line
@@ -114,6 +114,20 @@ struct rpc_cred *nfs4_get_renew_cred_locked(struct nfs_client *clp) 
	return cred;

}



#if defined(CONFIG_NFS_V4_1)



struct rpc_cred *nfs4_get_exchange_id_cred(struct nfs_client *clp)

{

	struct rpc_cred *cred;



	spin_lock(&clp->cl_lock);

	cred = nfs4_get_machine_cred_locked(clp);

	spin_unlock(&clp->cl_lock);

	return cred;

}



#endif /* CONFIG_NFS_V4_1 */



struct rpc_cred *nfs4_get_setclientid_cred(struct nfs_client *clp)

{

	struct nfs4_state_owner *sp;