From 0e0a7f802dd302d864a95cff532b97deadacdb9e Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Sat, 1 Jan 2011 15:43:50 -0500
Subject: [PATCH] --- yaml --- r: 231150 b: refs/heads/master c:
 3beb6cd1d448e7ded938bbd676493e6a08e9a6cd h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1b092a47ef1a..eaa78c114020 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65e4c8945575abca4e368e05ca3e9f77df030290
+refs/heads/master: 3beb6cd1d448e7ded938bbd676493e6a08e9a6cd
diff --git a/trunk/fs/nfsd/nfsproc.c b/trunk/fs/nfsd/nfsproc.c
index 08e17264784b..dc9c2e3fd1b8 100644
--- a/trunk/fs/nfsd/nfsproc.c
+++ b/trunk/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 },