nfsd: don't drop requests on -ENOMEM
authorJ. Bruce Fields <bfields@redhat.com>
Sat, 1 Jan 2011 20:43:50 +0000 (15:43 -0500)
committerJ. Bruce Fields <bfields@redhat.com>
Tue, 4 Jan 2011 21:49:20 +0000 (16:49 -0500)
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>
fs/nfsd/nfsproc.c

index 08e17264784b7f4dd2d5822cbb7c59a52a58f369..dc9c2e3fd1b87cbaf7a0ab9eda099c658751269c 100644 (file)
@@ -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 },