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

Commit f2dd436e authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Fix unused variable warnings in nfs4_init_*_client_string() 



Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 9a4bf31d

fs/nfs/nfs4proc.c

+3 −6
Original line number Diff line number Diff line
@@ -5050,7 +5050,6 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp, 
static int

nfs4_init_nonuniform_client_string(struct nfs_client *clp)

{

	int result;

	size_t len;

	char *str;
@@ -5078,7 +5077,7 @@ nfs4_init_nonuniform_client_string(struct nfs_client *clp) 
		return -ENOMEM;



	rcu_read_lock();

	result = scnprintf(str, len, "Linux NFSv4.0 %s/%s %s",

	scnprintf(str, len, "Linux NFSv4.0 %s/%s %s",

			clp->cl_ipaddr,

			rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_ADDR),

			rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_PROTO));
@@ -5091,7 +5090,6 @@ nfs4_init_nonuniform_client_string(struct nfs_client *clp) 
static int

nfs4_init_uniquifier_client_string(struct nfs_client *clp)

{

	int result;

	size_t len;

	char *str;
@@ -5111,7 +5109,7 @@ nfs4_init_uniquifier_client_string(struct nfs_client *clp) 
	if (!str)

		return -ENOMEM;



	result = scnprintf(str, len, "Linux NFSv%u.%u %s/%s",

	scnprintf(str, len, "Linux NFSv%u.%u %s/%s",

			clp->rpc_ops->version, clp->cl_minorversion,

			nfs4_client_id_uniquifier,

			clp->cl_rpcclient->cl_nodename);
@@ -5122,7 +5120,6 @@ nfs4_init_uniquifier_client_string(struct nfs_client *clp) 
static int

nfs4_init_uniform_client_string(struct nfs_client *clp)

{

	int result;

	size_t len;

	char *str;
@@ -5147,7 +5144,7 @@ nfs4_init_uniform_client_string(struct nfs_client *clp) 
	if (!str)

		return -ENOMEM;



	result = scnprintf(str, len, "Linux NFSv%u.%u %s",

	scnprintf(str, len, "Linux NFSv%u.%u %s",

			clp->rpc_ops->version, clp->cl_minorversion,

			clp->cl_rpcclient->cl_nodename);

	clp->cl_owner_id = str;