nfsd: Fix up some unused variable warnings (b96811cd) · Commits · 戴 / test

fs/nfsd/nfs4xdr.c

+4 −7

Original line number	Diff line number	Diff line
		@@ -1419,7 +1419,6 @@ nfsd4_decode_create_session(struct nfsd4_compoundargs *argp,
		struct nfsd4_create_session *sess)
		{
		DECODE_HEAD;
		u32 dummy;

		READ_BUF(16);
		COPYMEM(&sess->clientid, 8);
		@@ -1428,7 +1427,7 @@ nfsd4_decode_create_session(struct nfsd4_compoundargs *argp,

		/* Fore channel attrs */
		READ_BUF(28);
		dummy = be32_to_cpup(p++); /* headerpadsz is always 0 */
		p++; /* headerpadsz is always 0 */
		sess->fore_channel.maxreq_sz = be32_to_cpup(p++);
		sess->fore_channel.maxresp_sz = be32_to_cpup(p++);
		sess->fore_channel.maxresp_cached = be32_to_cpup(p++);
		@@ -1445,7 +1444,7 @@ nfsd4_decode_create_session(struct nfsd4_compoundargs *argp,

		/* Back channel attrs */
		READ_BUF(28);
		dummy = be32_to_cpup(p++); /* headerpadsz is always 0 */
		p++; /* headerpadsz is always 0 */
		sess->back_channel.maxreq_sz = be32_to_cpup(p++);
		sess->back_channel.maxresp_sz = be32_to_cpup(p++);
		sess->back_channel.maxresp_cached = be32_to_cpup(p++);
		@@ -1737,7 +1736,6 @@ static __be32
		nfsd4_decode_copy(struct nfsd4_compoundargs argp, struct nfsd4_copy copy)
		{
		DECODE_HEAD;
		unsigned int tmp;

		status = nfsd4_decode_stateid(argp, &copy->cp_src_stateid);
		if (status)
		@@ -1752,7 +1750,7 @@ nfsd4_decode_copy(struct nfsd4_compoundargs argp, struct nfsd4_copy copy)
		p = xdr_decode_hyper(p, &copy->cp_count);
		p++; /* ca_consecutive: we always do consecutive copies */
		copy->cp_synchronous = be32_to_cpup(p++);
		tmp = be32_to_cpup(p); /* Source server list not supported */
		/* tmp = be32_to_cpup(p); Source server list not supported */

		DECODE_TAIL;
		}
		@@ -3218,9 +3216,8 @@ nfsd4_encode_create(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_
		if (!p)
		return nfserr_resource;
		encode_cinfo(p, &create->cr_cinfo);
		nfserr = nfsd4_encode_bitmap(xdr, create->cr_bmval[0],
		return nfsd4_encode_bitmap(xdr, create->cr_bmval[0],
		create->cr_bmval[1], create->cr_bmval[2]);
		return 0;
		}

		static __be32

Admin message