Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdac86e2 authored by Andy Adamson's avatar Andy Adamson Committed by J. Bruce Fields
Browse files

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: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent a8dfdaeb

fs/nfsd/nfs4state.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -469,7 +469,7 @@ static int set_forechannel_drc_size(struct nfsd4_channel_attrs *fchan) 
	spin_unlock(&nfsd_drc_lock);

	spin_unlock(&nfsd_drc_lock);





	if (fchan->maxreqs == 0)

	if (fchan->maxreqs == 0)

		return nfserr_resource;

		return nfserr_serverfault;





	fchan->maxresp_cached = size + NFSD_MIN_HDR_SEQ_SZ;

	fchan->maxresp_cached = size + NFSD_MIN_HDR_SEQ_SZ;

	return 0;

	return 0;
@@ -519,7 +519,7 @@ alloc_init_session(struct svc_rqst *rqstp, struct nfs4_client *clp, 
		   struct nfsd4_create_session *cses)

		   struct nfsd4_create_session *cses)

{

{

	struct nfsd4_session *new, tmp;

	struct nfsd4_session *new, tmp;

	int idx, status = nfserr_resource, slotsize;

	int idx, status = nfserr_serverfault, slotsize;





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

	memset(&tmp, 0, sizeof(tmp));
@@ -1282,7 +1282,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, 
	/* Normal case */

	/* Normal case */

	new = create_client(exid->clname, dname);

	new = create_client(exid->clname, dname);

	if (new == NULL) {

	if (new == NULL) {

		status = nfserr_resource;

		status = nfserr_serverfault;

		goto out;

		goto out;

	}

	}