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

Commit 69dd716c authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Add socket proto argument to setclientid 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 3c7c7e48

fs/nfs/nfs4proc.c

+3 −1
Original line number Diff line number Diff line
@@ -2891,10 +2891,12 @@ int nfs4_proc_setclientid(struct nfs_client *clp, u32 program, unsigned short po 


	for(;;) {

		setclientid.sc_name_len = scnprintf(setclientid.sc_name,

				sizeof(setclientid.sc_name), "%s/%s %s %u",

				sizeof(setclientid.sc_name), "%s/%s %s %s %u",

				clp->cl_ipaddr,

				rpc_peeraddr2str(clp->cl_rpcclient,

							RPC_DISPLAY_ADDR),

				rpc_peeraddr2str(clp->cl_rpcclient,

							RPC_DISPLAY_PROTO),

				cred->cr_ops->cr_name,

				clp->cl_id_uniquifier);

		setclientid.sc_netid_len = scnprintf(setclientid.sc_netid,

include/linux/nfs_xdr.h

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ struct nfs4_rename_res { 
	struct nfs_fattr *		new_fattr;

};



#define NFS4_SETCLIENTID_NAMELEN	(48)

#define NFS4_SETCLIENTID_NAMELEN	(56)

struct nfs4_setclientid {

	const nfs4_verifier *		sc_verifier;

	unsigned int			sc_name_len;