mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-26 08:31:13 +00:00
nfs: nfs4xdr: simplify decode_exchange_id by reusing decode_opaque_inline
Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
99398d0655
commit
2460ba57c4
1 changed files with 10 additions and 9 deletions
|
@ -4144,6 +4144,7 @@ static int decode_exchange_id(struct xdr_stream *xdr,
|
||||||
{
|
{
|
||||||
__be32 *p;
|
__be32 *p;
|
||||||
uint32_t dummy;
|
uint32_t dummy;
|
||||||
|
char *dummy_str;
|
||||||
int status;
|
int status;
|
||||||
struct nfs_client *clp = res->client;
|
struct nfs_client *clp = res->client;
|
||||||
|
|
||||||
|
@ -4166,19 +4167,19 @@ static int decode_exchange_id(struct xdr_stream *xdr,
|
||||||
READ_BUF(8);
|
READ_BUF(8);
|
||||||
|
|
||||||
/* Throw away Major id */
|
/* Throw away Major id */
|
||||||
READ_BUF(4);
|
status = decode_opaque_inline(xdr, &dummy, &dummy_str);
|
||||||
dummy = be32_to_cpup(p++);
|
if (unlikely(status))
|
||||||
READ_BUF(dummy);
|
return status;
|
||||||
|
|
||||||
/* Throw away server_scope */
|
/* Throw away server_scope */
|
||||||
READ_BUF(4);
|
status = decode_opaque_inline(xdr, &dummy, &dummy_str);
|
||||||
dummy = be32_to_cpup(p++);
|
if (unlikely(status))
|
||||||
READ_BUF(dummy);
|
return status;
|
||||||
|
|
||||||
/* Throw away Implementation id array */
|
/* Throw away Implementation id array */
|
||||||
READ_BUF(4);
|
status = decode_opaque_inline(xdr, &dummy, &dummy_str);
|
||||||
dummy = be32_to_cpup(p++);
|
if (unlikely(status))
|
||||||
READ_BUF(dummy);
|
return status;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue