diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2013-04-30 18:48:45 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2013-04-30 19:18:21 -0400 |
| commit | ed9411a00464860cafe7e07224818cdf04fd9e89 (patch) | |
| tree | a85d2991121f0556c4268438fd8e99241b752341 /fs/nfsd | |
| parent | c8c797f9fdf655245c0d60667af6efa7b32c98f1 (diff) | |
| download | linux-stable-ed9411a00464860cafe7e07224818cdf04fd9e89.tar.gz linux-stable-ed9411a00464860cafe7e07224818cdf04fd9e89.tar.bz2 linux-stable-ed9411a00464860cafe7e07224818cdf04fd9e89.zip | |
NFSD: Simplify GSS flavor encoding in nfsd4_do_encode_secinfo()
Clean up.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 78272185a13d..a885e97dc5f4 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3119,17 +3119,11 @@ nfsd4_do_encode_secinfo(struct nfsd4_compoundres *resp, struct rpcsec_gss_info info; if (rpcauth_get_gssinfo(flavs[i].pseudoflavor, &info) == 0) { - RESERVE_SPACE(4); + RESERVE_SPACE(4 + 4 + info.oid.len + 4 + 4); WRITE32(RPC_AUTH_GSS); - ADJUST_ARGS(); - RESERVE_SPACE(4 + info.oid.len); WRITE32(info.oid.len); WRITEMEM(info.oid.data, info.oid.len); - ADJUST_ARGS(); - RESERVE_SPACE(4); WRITE32(info.qop); - ADJUST_ARGS(); - RESERVE_SPACE(4); WRITE32(info.service); ADJUST_ARGS(); } else { |