diff options
| author | NeilBrown <neilb@suse.de> | 2010-08-12 03:04:07 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-09-21 19:16:31 -0400 |
| commit | 2ed5282cd9b44686a6e718269abb5c5cd332d8f1 (patch) | |
| tree | 7c7c00b3b1f52f4d038e04bcc46d1e8cd4eff8ff | |
| parent | 839049a8732d689d02051e0198fb60a22f7ccb4b (diff) | |
svcauth_gss: replace a trivial 'switch' with an 'if'
Code like:
switch(xxx) {
case -error1:
case -error2:
..
return;
case 0:
stuff;
}
can more naturally be written:
if (xxx < 0)
return;
stuff;
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | net/sunrpc/auth_gss/svcauth_gss.c | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index ed005af3ef5d..dec2a6fc7c12 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c | |||
| @@ -1034,30 +1034,27 @@ static int svcauth_gss_handle_init(struct svc_rqst *rqstp, | |||
| 1034 | rsi_free(&rsikey); | 1034 | rsi_free(&rsikey); |
| 1035 | if (!rsip) | 1035 | if (!rsip) |
| 1036 | return SVC_CLOSE; | 1036 | return SVC_CLOSE; |
| 1037 | switch (cache_check(&rsi_cache, &rsip->h, &rqstp->rq_chandle)) { | 1037 | if (cache_check(&rsi_cache, &rsip->h, &rqstp->rq_chandle) < 0) |
| 1038 | case -EAGAIN: | ||
| 1039 | case -ETIMEDOUT: | ||
| 1040 | case -ENOENT: | ||
| 1041 | /* No upcall result: */ | 1038 | /* No upcall result: */ |
| 1042 | return SVC_CLOSE; | 1039 | return SVC_CLOSE; |
| 1043 | case 0: | 1040 | |
| 1044 | ret = SVC_CLOSE; | 1041 | ret = SVC_CLOSE; |
| 1045 | /* Got an answer to the upcall; use it: */ | 1042 | /* Got an answer to the upcall; use it: */ |
| 1046 | if (gss_write_init_verf(rqstp, rsip)) | 1043 | if (gss_write_init_verf(rqstp, rsip)) |
| 1047 | goto out; | 1044 | goto out; |
| 1048 | if (resv->iov_len + 4 > PAGE_SIZE) | 1045 | if (resv->iov_len + 4 > PAGE_SIZE) |
| 1049 | goto out; | 1046 | goto out; |
| 1050 | svc_putnl(resv, RPC_SUCCESS); | 1047 | svc_putnl(resv, RPC_SUCCESS); |
| 1051 | if (svc_safe_putnetobj(resv, &rsip->out_handle)) | 1048 | if (svc_safe_putnetobj(resv, &rsip->out_handle)) |
| 1052 | goto out; | 1049 | goto out; |
| 1053 | if (resv->iov_len + 3 * 4 > PAGE_SIZE) | 1050 | if (resv->iov_len + 3 * 4 > PAGE_SIZE) |
| 1054 | goto out; | 1051 | goto out; |
| 1055 | svc_putnl(resv, rsip->major_status); | 1052 | svc_putnl(resv, rsip->major_status); |
| 1056 | svc_putnl(resv, rsip->minor_status); | 1053 | svc_putnl(resv, rsip->minor_status); |
| 1057 | svc_putnl(resv, GSS_SEQ_WIN); | 1054 | svc_putnl(resv, GSS_SEQ_WIN); |
| 1058 | if (svc_safe_putnetobj(resv, &rsip->out_token)) | 1055 | if (svc_safe_putnetobj(resv, &rsip->out_token)) |
| 1059 | goto out; | 1056 | goto out; |
| 1060 | } | 1057 | |
| 1061 | ret = SVC_COMPLETE; | 1058 | ret = SVC_COMPLETE; |
| 1062 | out: | 1059 | out: |
| 1063 | cache_put(&rsip->h, &rsi_cache); | 1060 | cache_put(&rsip->h, &rsi_cache); |
