diff --git a/[refs] b/[refs]
index 080024c46e84..660f036bc14e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83bbe2ef63ec4f6a22aaaa0c03bd918b38300127
+refs/heads/master: 63f103111fdfc3cba00e4c94921d32362f375d93
diff --git a/trunk/fs/nfsd/nfsproc.c b/trunk/fs/nfsd/nfsproc.c
index 09030afd7249..03ab6822291f 100644
--- a/trunk/fs/nfsd/nfsproc.c
+++ b/trunk/fs/nfsd/nfsproc.c
@@ -579,11 +579,11 @@ struct svc_version	nfsd_version2 = {
 /*
  * Map errnos to NFS errnos.
  */
-int
+__be32
 nfserrno (int errno)
 {
 	static struct {
-		int	nfserr;
+		__be32	nfserr;
 		int	syserr;
 	} nfs_errtbl[] = {
 		{ nfs_ok, 0 },
@@ -615,11 +615,10 @@ nfserrno (int errno)
 		{ nfserr_badname, -ESRCH },
 		{ nfserr_io, -ETXTBSY },
 		{ nfserr_notsupp, -EOPNOTSUPP },
-		{ -1, -EIO }
 	};
 	int	i;
 
-	for (i = 0; nfs_errtbl[i].nfserr != -1; i++) {
+	for (i = 0; i < ARRAY_SIZE(nfs_errtbl); i++) {
 		if (nfs_errtbl[i].syserr == errno)
 			return nfs_errtbl[i].nfserr;
 	}
diff --git a/trunk/include/linux/nfsd/export.h b/trunk/include/linux/nfsd/export.h
index 6e78ea969f49..27666f5b8b53 100644
--- a/trunk/include/linux/nfsd/export.h
+++ b/trunk/include/linux/nfsd/export.h
@@ -118,7 +118,7 @@ struct svc_export *	exp_parent(struct auth_domain *clp,
 int			exp_rootfh(struct auth_domain *, 
 					char *path, struct knfsd_fh *, int maxsize);
 int			exp_pseudoroot(struct auth_domain *, struct svc_fh *fhp, struct cache_req *creq);
-int			nfserrno(int errno);
+__be32			nfserrno(int errno);
 
 extern struct cache_detail svc_export_cache;