Commit f2dd436e authored by Trond Myklebust's avatar Trond Myklebust

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

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 9a4bf31d
...@@ -5050,7 +5050,6 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp, ...@@ -5050,7 +5050,6 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp,
static int static int
nfs4_init_nonuniform_client_string(struct nfs_client *clp) nfs4_init_nonuniform_client_string(struct nfs_client *clp)
{ {
int result;
size_t len; size_t len;
char *str; char *str;
...@@ -5078,7 +5077,7 @@ nfs4_init_nonuniform_client_string(struct nfs_client *clp) ...@@ -5078,7 +5077,7 @@ nfs4_init_nonuniform_client_string(struct nfs_client *clp)
return -ENOMEM; return -ENOMEM;
rcu_read_lock(); 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, clp->cl_ipaddr,
rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_ADDR), rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_ADDR),
rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_PROTO)); rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_PROTO));
...@@ -5091,7 +5090,6 @@ nfs4_init_nonuniform_client_string(struct nfs_client *clp) ...@@ -5091,7 +5090,6 @@ nfs4_init_nonuniform_client_string(struct nfs_client *clp)
static int static int
nfs4_init_uniquifier_client_string(struct nfs_client *clp) nfs4_init_uniquifier_client_string(struct nfs_client *clp)
{ {
int result;
size_t len; size_t len;
char *str; char *str;
...@@ -5111,7 +5109,7 @@ nfs4_init_uniquifier_client_string(struct nfs_client *clp) ...@@ -5111,7 +5109,7 @@ nfs4_init_uniquifier_client_string(struct nfs_client *clp)
if (!str) if (!str)
return -ENOMEM; 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, clp->rpc_ops->version, clp->cl_minorversion,
nfs4_client_id_uniquifier, nfs4_client_id_uniquifier,
clp->cl_rpcclient->cl_nodename); clp->cl_rpcclient->cl_nodename);
...@@ -5122,7 +5120,6 @@ nfs4_init_uniquifier_client_string(struct nfs_client *clp) ...@@ -5122,7 +5120,6 @@ nfs4_init_uniquifier_client_string(struct nfs_client *clp)
static int static int
nfs4_init_uniform_client_string(struct nfs_client *clp) nfs4_init_uniform_client_string(struct nfs_client *clp)
{ {
int result;
size_t len; size_t len;
char *str; char *str;
...@@ -5147,7 +5144,7 @@ nfs4_init_uniform_client_string(struct nfs_client *clp) ...@@ -5147,7 +5144,7 @@ nfs4_init_uniform_client_string(struct nfs_client *clp)
if (!str) if (!str)
return -ENOMEM; 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->rpc_ops->version, clp->cl_minorversion,
clp->cl_rpcclient->cl_nodename); clp->cl_rpcclient->cl_nodename);
clp->cl_owner_id = str; clp->cl_owner_id = str;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment