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

Commit 4a3e5779 authored by Kinglong Mee's avatar Kinglong Mee Committed by Trond Myklebust
Browse files

nfs: Remove unneeded checking of the return value from scnprintf 



The return value from scnprintf always less than the buffer length.
So, result >= len always false. This patch removes those checking.

int vscnprintf(char *buf, size_t size, const char *fmt, va_list args)
{
        int i;

	i = vsnprintf(buf, size, fmt, args);

	if (likely(i < size))
		return i;
	if (size != 0)
		return size - 1;
	return 0;
}

Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 4a70316c

fs/nfs/nfs4proc.c

+1 −18
Original line number Diff line number Diff line
@@ -5014,11 +5014,10 @@ nfs4_init_nonuniform_client_string(struct nfs_client *clp) 
	int result;

	size_t len;

	char *str;

	bool retried = false;



	if (clp->cl_owner_id != NULL)

		return 0;

retry:



	rcu_read_lock();

	len = 14 + strlen(clp->cl_ipaddr) + 1 +

		strlen(rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_ADDR)) +
@@ -5046,14 +5045,6 @@ nfs4_init_nonuniform_client_string(struct nfs_client *clp) 
			rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_PROTO));

	rcu_read_unlock();



	/* Did something change? */

	if (result >= len) {

		kfree(str);

		if (retried)

			return -EINVAL;

		retried = true;

		goto retry;

	}

	clp->cl_owner_id = str;

	return 0;

}
@@ -5085,10 +5076,6 @@ nfs4_init_uniquifier_client_string(struct nfs_client *clp) 
			clp->rpc_ops->version, clp->cl_minorversion,

			nfs4_client_id_uniquifier,

			clp->cl_rpcclient->cl_nodename);

	if (result >= len) {

		kfree(str);

		return -EINVAL;

	}

	clp->cl_owner_id = str;

	return 0;

}
@@ -5124,10 +5111,6 @@ nfs4_init_uniform_client_string(struct nfs_client *clp) 
	result = scnprintf(str, len, "Linux NFSv%u.%u %s",

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

			clp->cl_rpcclient->cl_nodename);

	if (result >= len) {

		kfree(str);

		return -EINVAL;

	}

	clp->cl_owner_id = str;

	return 0;

}