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

Commit 2460ba57 authored by Benny Halevy's avatar Benny Halevy Committed by Trond Myklebust
Browse files

nfs: nfs4xdr: simplify decode_exchange_id by reusing decode_opaque_inline 



Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 99398d06

fs/nfs/nfs4xdr.c

+10 −9
Original line number Diff line number Diff line
@@ -4144,6 +4144,7 @@ static int decode_exchange_id(struct xdr_stream *xdr, 
{

	__be32 *p;

	uint32_t dummy;

	char *dummy_str;

	int status;

	struct nfs_client *clp = res->client;
@@ -4166,19 +4167,19 @@ static int decode_exchange_id(struct xdr_stream *xdr, 
	READ_BUF(8);



	/* Throw away Major id */

	READ_BUF(4);

	dummy = be32_to_cpup(p++);

	READ_BUF(dummy);

	status = decode_opaque_inline(xdr, &dummy, &dummy_str);

	if (unlikely(status))

		return status;



	/* Throw away server_scope */

	READ_BUF(4);

	dummy = be32_to_cpup(p++);

	READ_BUF(dummy);

	status = decode_opaque_inline(xdr, &dummy, &dummy_str);

	if (unlikely(status))

		return status;



	/* Throw away Implementation id array */

	READ_BUF(4);

	dummy = be32_to_cpup(p++);

	READ_BUF(dummy);

	status = decode_opaque_inline(xdr, &dummy, &dummy_str);

	if (unlikely(status))

		return status;



	return 0;

}