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

Commit 4731030d authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: translate memory errors to delay, not serverfault 



If the server is out of memory is better for clients to back off and
retry than to just error out.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 76407f76

fs/nfsd/nfs4state.c

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



	if (fchan->maxreqs == 0)

		return nfserr_serverfault;

		return nfserr_jukebox;



	fchan->maxresp_cached = size + NFSD_MIN_HDR_SEQ_SZ;

	return 0;
@@ -542,7 +542,7 @@ alloc_init_session(struct svc_rqst *rqstp, struct nfs4_client *clp, 
	BUILD_BUG_ON(NFSD_MAX_SLOTS_PER_SESSION * sizeof(struct nfsd4_slot)

		     + sizeof(struct nfsd4_session) > PAGE_SIZE);



	status = nfserr_serverfault;

	status = nfserr_jukebox;

	/* allocate struct nfsd4_session and slot table pointers in one piece */

	slotsize = tmp.se_fchannel.maxreqs * sizeof(struct nfsd4_slot *);

	new = kzalloc(sizeof(*new) + slotsize, GFP_KERNEL);
@@ -1219,7 +1219,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, 
	/* Normal case */

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

	if (new == NULL) {

		status = nfserr_serverfault;

		status = nfserr_jukebox;

		goto out;

	}