The patch titled
nfsd: nfserrno() endianness annotations
has been removed from the -mm tree. Its filename was
nfsd-nfserrno-endianness-annotations.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: nfsd: nfserrno() endianness annotations
From: Al Viro <viro@xxxxxxxxxxxxxxxx>
Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Acked-by: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Acked-by: Neil Brown <neilb@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfsd/nfsproc.c | 7 +++----
include/linux/nfsd/export.h | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff -puN fs/nfsd/nfsproc.c~nfsd-nfserrno-endianness-annotations fs/nfsd/nfsproc.c
--- a/fs/nfsd/nfsproc.c~nfsd-nfserrno-endianness-annotations
+++ a/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 -puN include/linux/nfsd/export.h~nfsd-nfserrno-endianness-annotations include/linux/nfsd/export.h
--- a/include/linux/nfsd/export.h~nfsd-nfserrno-endianness-annotations
+++ a/include/linux/nfsd/export.h
@@ -118,7 +118,7 @@ struct svc_export * exp_parent(struct au
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;
_
Patches currently in -mm which might be from viro@xxxxxxxxxxxxxxxx are
origin.patch
git-netdev-all.patch
slab-leaks3-default-y.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
