summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2011-01-01 15:43:50 -0500
committerJ. Bruce Fields <bfields@redhat.com>2011-01-04 16:49:20 -0500
commit3beb6cd1d448e7ded938bbd676493e6a08e9a6cd (patch)
treed33cdca2db5433f65cfbaa67068feebf9017cbe8 /fs/nfsd
parent65e4c8945575abca4e368e05ca3e9f77df030290 (diff)
downloadop-kernel-dev-3beb6cd1d448e7ded938bbd676493e6a08e9a6cd.zip
op-kernel-dev-3beb6cd1d448e7ded938bbd676493e6a08e9a6cd.tar.gz
nfsd: don't drop requests on -ENOMEM
We never want to drop a request if we could return a JUKEBOX/DELAY error instead; so, convert to nfserr_jukebox and let nfsd_dispatch() convert that to a dropit error as a last resort if JUKEBOX/DELAY is unavailable (as in the NFSv2 case). Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfsproc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c
index 08e1726..dc9c2e3 100644
--- a/fs/nfsd/nfsproc.c
+++ b/fs/nfsd/nfsproc.c
@@ -736,7 +736,7 @@ nfserrno (int errno)
{ nfserr_jukebox, -ETIMEDOUT },
{ nfserr_jukebox, -ERESTARTSYS },
{ nfserr_dropit, -EAGAIN },
- { nfserr_dropit, -ENOMEM },
+ { nfserr_jukebox, -ENOMEM },
{ nfserr_badname, -ESRCH },
{ nfserr_io, -ETXTBSY },
{ nfserr_notsupp, -EOPNOTSUPP },
OpenPOWER on IntegriCloud