diff options
author | Andy Adamson <andros@netapp.com> | 2009-08-28 08:45:03 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-09-01 22:24:05 -0400 |
commit | bdac86e2154cfe47552639113265d1fa27cfbe72 (patch) | |
tree | 3e8e9aaac30ebea8e741c1da29c1caacf2943fea | |
parent | a8dfdaeb7a8b1295f45d9d208dd27e6e20113d1b (diff) |
nfsd41: replace nfserr_resource in pure nfs41 responses
nfserr_resource is not a legal error for NFSv4.1. Replace it with
nfserr_serverfault for EXCHANGE_ID and CREATE_SESSION processing.
We will also need to map nfserr_resource to other errors in routines shared
by NFSv4.0 and NFSv4.1
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
-rw-r--r-- | fs/nfsd/nfs4state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index ec074e7959f5..c9a45f49019d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -469,7 +469,7 @@ static int set_forechannel_drc_size(struct nfsd4_channel_attrs *fchan) | |||
469 | spin_unlock(&nfsd_drc_lock); | 469 | spin_unlock(&nfsd_drc_lock); |
470 | 470 | ||
471 | if (fchan->maxreqs == 0) | 471 | if (fchan->maxreqs == 0) |
472 | return nfserr_resource; | 472 | return nfserr_serverfault; |
473 | 473 | ||
474 | fchan->maxresp_cached = size + NFSD_MIN_HDR_SEQ_SZ; | 474 | fchan->maxresp_cached = size + NFSD_MIN_HDR_SEQ_SZ; |
475 | return 0; | 475 | return 0; |
@@ -519,7 +519,7 @@ alloc_init_session(struct svc_rqst *rqstp, struct nfs4_client *clp, | |||
519 | struct nfsd4_create_session *cses) | 519 | struct nfsd4_create_session *cses) |
520 | { | 520 | { |
521 | struct nfsd4_session *new, tmp; | 521 | struct nfsd4_session *new, tmp; |
522 | int idx, status = nfserr_resource, slotsize; | 522 | int idx, status = nfserr_serverfault, slotsize; |
523 | 523 | ||
524 | memset(&tmp, 0, sizeof(tmp)); | 524 | memset(&tmp, 0, sizeof(tmp)); |
525 | 525 | ||
@@ -1282,7 +1282,7 @@ out_new: | |||
1282 | /* Normal case */ | 1282 | /* Normal case */ |
1283 | new = create_client(exid->clname, dname); | 1283 | new = create_client(exid->clname, dname); |
1284 | if (new == NULL) { | 1284 | if (new == NULL) { |
1285 | status = nfserr_resource; | 1285 | status = nfserr_serverfault; |
1286 | goto out; | 1286 | goto out; |
1287 | } | 1287 | } |
1288 | 1288 | ||