From 2580476c89a3c1f47eeb6029e32c96b2c5813f76 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Tue, 4 Jan 2011 18:02:15 -0500
Subject: [PATCH] --- yaml --- r: 231161 b: refs/heads/master c:
 f6af99ec1b261e21219d5eba99e3af48fc6c32d4 h: refs/heads/master i:   231159:
 581bdf833cd06f8664ed4c56ff0325d83bbcc8c1 v: v3

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

diff --git a/[refs] b/[refs]
index 5af763df9c25..41e98f0cd69d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 255c7cf810e4776ae8f1023332060459f30d8a2a
+refs/heads/master: f6af99ec1b261e21219d5eba99e3af48fc6c32d4
diff --git a/trunk/fs/nfsd/nfs4idmap.c b/trunk/fs/nfsd/nfs4idmap.c
index f0695e815f0e..844960fd0395 100644
--- a/trunk/fs/nfsd/nfs4idmap.c
+++ b/trunk/fs/nfsd/nfs4idmap.c
@@ -524,13 +524,13 @@ idmap_name_to_id(struct svc_rqst *rqstp, int type, const char *name, u32 namelen
 	int ret;
 
 	if (namelen + 1 > sizeof(key.name))
-		return -EINVAL;
+		return -ESRCH; /* nfserr_badowner */
 	memcpy(key.name, name, namelen);
 	key.name[namelen] = '\0';
 	strlcpy(key.authname, rqst_authname(rqstp), sizeof(key.authname));
 	ret = idmap_lookup(rqstp, nametoid_lookup, &key, &nametoid_cache, &item);
 	if (ret == -ENOENT)
-		ret = -ESRCH; /* nfserr_badname */
+		ret = -ESRCH; /* nfserr_badowner */
 	if (ret)
 		return ret;
 	*id = item->id;
diff --git a/trunk/fs/nfsd/nfsd.h b/trunk/fs/nfsd/nfsd.h
index 6b641cf2c19a..7ecfa2420307 100644
--- a/trunk/fs/nfsd/nfsd.h
+++ b/trunk/fs/nfsd/nfsd.h
@@ -158,6 +158,7 @@ void		nfsd_lockd_shutdown(void);
 #define	nfserr_attrnotsupp	cpu_to_be32(NFSERR_ATTRNOTSUPP)
 #define	nfserr_bad_xdr		cpu_to_be32(NFSERR_BAD_XDR)
 #define	nfserr_openmode		cpu_to_be32(NFSERR_OPENMODE)
+#define	nfserr_badowner		cpu_to_be32(NFSERR_BADOWNER)
 #define	nfserr_locks_held	cpu_to_be32(NFSERR_LOCKS_HELD)
 #define	nfserr_op_illegal	cpu_to_be32(NFSERR_OP_ILLEGAL)
 #define	nfserr_grace		cpu_to_be32(NFSERR_GRACE)
diff --git a/trunk/fs/nfsd/nfsproc.c b/trunk/fs/nfsd/nfsproc.c
index fd608a27a8d5..8f05dcd0bf85 100644
--- a/trunk/fs/nfsd/nfsproc.c
+++ b/trunk/fs/nfsd/nfsproc.c
@@ -738,7 +738,7 @@ nfserrno (int errno)
 		{ nfserr_jukebox, -EAGAIN },
 		{ nfserr_jukebox, -EWOULDBLOCK },
 		{ nfserr_jukebox, -ENOMEM },
-		{ nfserr_badname, -ESRCH },
+		{ nfserr_badowner, -ESRCH },
 		{ nfserr_io, -ETXTBSY },
 		{ nfserr_notsupp, -EOPNOTSUPP },
 		{ nfserr_toosmall, -ETOOSMALL },