diff options
| author | J. Bruce Fields | 2013-01-18 17:33:08 +0100 |
|---|---|---|
| committer | J. Bruce Fields | 2014-01-07 22:01:16 +0100 |
| commit | bba0f88bf7c4ad467eeb3a17443de1f9cd0437e0 (patch) | |
| tree | 8372a646ac039ee34d4292042cf523220a37df2c /net | |
| parent | nfsd4: better VERIFY comment (diff) | |
| download | kernel-qcow2-linux-bba0f88bf7c4ad467eeb3a17443de1f9cd0437e0.tar.gz kernel-qcow2-linux-bba0f88bf7c4ad467eeb3a17443de1f9cd0437e0.tar.xz kernel-qcow2-linux-bba0f88bf7c4ad467eeb3a17443de1f9cd0437e0.zip | |
minor svcauth_gss.c cleanup
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/auth_gss/svcauth_gss.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index 2a935404047f..0f73f4507746 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c @@ -1591,8 +1591,7 @@ svcauth_gss_wrap_resp_integ(struct svc_rqst *rqstp) BUG_ON(integ_len % 4); *p++ = htonl(integ_len); *p++ = htonl(gc->gc_seq); - if (xdr_buf_subsegment(resbuf, &integ_buf, integ_offset, - integ_len)) + if (xdr_buf_subsegment(resbuf, &integ_buf, integ_offset, integ_len)) BUG(); if (resbuf->tail[0].iov_base == NULL) { if (resbuf->head[0].iov_len + RPC_MAX_AUTH_SIZE > PAGE_SIZE) @@ -1600,10 +1599,8 @@ svcauth_gss_wrap_resp_integ(struct svc_rqst *rqstp) resbuf->tail[0].iov_base = resbuf->head[0].iov_base + resbuf->head[0].iov_len; resbuf->tail[0].iov_len = 0; - resv = &resbuf->tail[0]; - } else { - resv = &resbuf->tail[0]; } + resv = &resbuf->tail[0]; mic.data = (u8 *)resv->iov_base + resv->iov_len + 4; if (gss_get_mic(gsd->rsci->mechctx, &integ_buf, &mic)) goto out_err; |