From 8b2414baff7d628b3530dfd14b0b71d84f361e18 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Tue, 22 Jun 2010 16:17:12 -0400 Subject: [PATCH] --- yaml --- r: 206427 b: refs/heads/master c: 4731030d58a146630f5e8a0519661a5344a60f45 h: refs/heads/master i: 206425: cc3f3aeeb57a0abc6528a6101e9d77ea45098226 206423: fdae4a7d61aaa075893e46cf122461864eefacfa v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dbcdd199ab8d..73a953748c18 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76407f76e0f71428f3c31faff004bff87fea51ba +refs/heads/master: 4731030d58a146630f5e8a0519661a5344a60f45 diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index 5a69ee69b44f..603076f66fe7 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/fs/nfsd/nfs4state.c @@ -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; }