Skip to content

Commit

Permalink
nfsd41: replace nfserr_resource in pure nfs41 responses
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andy Adamson authored and J. Bruce Fields committed Sep 2, 2009
1 parent a8dfdae commit bdac86e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions fs/nfsd/nfs4state.c
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ static int set_forechannel_drc_size(struct nfsd4_channel_attrs *fchan)
spin_unlock(&nfsd_drc_lock);

if (fchan->maxreqs == 0)
return nfserr_resource;
return nfserr_serverfault;

fchan->maxresp_cached = size + NFSD_MIN_HDR_SEQ_SZ;
return 0;
Expand Down Expand Up @@ -519,7 +519,7 @@ alloc_init_session(struct svc_rqst *rqstp, struct nfs4_client *clp,
struct nfsd4_create_session *cses)
{
struct nfsd4_session *new, tmp;
int idx, status = nfserr_resource, slotsize;
int idx, status = nfserr_serverfault, slotsize;

memset(&tmp, 0, sizeof(tmp));

Expand Down Expand Up @@ -1282,7 +1282,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp,
/* Normal case */
new = create_client(exid->clname, dname);
if (new == NULL) {
status = nfserr_resource;
status = nfserr_serverfault;
goto out;
}

Expand Down

0 comments on commit bdac86e

Please sign in to comment.