diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2013-04-08 15:42:12 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2013-04-09 15:49:50 -0400 |
| commit | 373cd4098a6392395af63af220d989df00b444f7 (patch) | |
| tree | 550e1ef40cfbf0b986e4422fa8354ed70023572f /fs/nfsd | |
| parent | 0c7c3e67ab91ec6caa44bdf1fc89a48012ceb0c5 (diff) | |
| download | linux-stable-373cd4098a6392395af63af220d989df00b444f7.tar.gz linux-stable-373cd4098a6392395af63af220d989df00b444f7.tar.bz2 linux-stable-373cd4098a6392395af63af220d989df00b444f7.zip | |
nfsd4: cleanup check_forechannel_attrs
Pass this struct by reference, not by value, and return an error instead
of a boolean to allow for future additions.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 7d2e3b54b9df..f1262f73f08b 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1803,10 +1803,13 @@ nfsd4_replay_create_session(struct nfsd4_create_session *cr_ses, /* seqid, slotID, slotID, slotID, status */ \ 5 ) * sizeof(__be32)) -static bool check_forechannel_attrs(struct nfsd4_channel_attrs fchannel) +static __be32 check_forechannel_attrs(struct nfsd4_channel_attrs *ca) { - return fchannel.maxreq_sz < NFSD_MIN_REQ_HDR_SEQ_SZ - || fchannel.maxresp_sz < NFSD_MIN_RESP_HDR_SEQ_SZ; + if (ca->maxreq_sz < NFSD_MIN_REQ_HDR_SEQ_SZ) + return nfserr_toosmall; + if (ca->maxresp_sz < NFSD_MIN_RESP_HDR_SEQ_SZ) + return nfserr_toosmall; + return nfs_ok; } __be32 @@ -1824,8 +1827,9 @@ nfsd4_create_session(struct svc_rqst *rqstp, if (cr_ses->flags & ~SESSION4_FLAG_MASK_A) return nfserr_inval; - if (check_forechannel_attrs(cr_ses->fore_channel)) - return nfserr_toosmall; + status = check_forechannel_attrs(&cr_ses->fore_channel); + if (status) + return status; new = alloc_session(&cr_ses->fore_channel, nn); if (!new) return nfserr_jukebox; |