From 2bccc484d823bf4656a86b15c860a7136dd6f319 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Sun, 2 Jan 2011 22:05:33 -0500
Subject: [PATCH] --- yaml --- r: 231153 b: refs/heads/master c:
 062304a815fe10068c478a4a3f28cf091c55cb82 h: refs/heads/master i:   231151:
 10d3547c64e9089972b54fccbcc417a4766d73c5 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfsd/nfsproc.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9694236edcb8..a2389a9d7c1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e701c610923aaeac8b38b9202a686d1cc9ee35d
+refs/heads/master: 062304a815fe10068c478a4a3f28cf091c55cb82
diff --git a/trunk/fs/nfsd/nfsproc.c b/trunk/fs/nfsd/nfsproc.c
index dc9c2e3fd1b8..fd608a27a8d5 100644
--- a/trunk/fs/nfsd/nfsproc.c
+++ b/trunk/fs/nfsd/nfsproc.c
@@ -735,7 +735,8 @@ nfserrno (int errno)
 		{ nfserr_stale, -ESTALE },
 		{ nfserr_jukebox, -ETIMEDOUT },
 		{ nfserr_jukebox, -ERESTARTSYS },
-		{ nfserr_dropit, -EAGAIN },
+		{ nfserr_jukebox, -EAGAIN },
+		{ nfserr_jukebox, -EWOULDBLOCK },
 		{ nfserr_jukebox, -ENOMEM },
 		{ nfserr_badname, -ESRCH },
 		{ nfserr_io, -ETXTBSY },