All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chuck Lever <chuck.lever@oracle.com>
To: trond.myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH 07/11] NFS: Use the "nfs_stat" enum for nfs_stat_to_errno()'s argument
Date: Fri, 10 Sep 2010 16:09:50 -0400	[thread overview]
Message-ID: <20100910200949.13321.70782.stgit@seurat.1015granger.net> (raw)
In-Reply-To: <20100910200512.13321.55605.stgit@seurat.1015granger.net>

Clean up:  To distinguish more clearly between the on-the-wire NFSERR_
value and our local errno values, use the proper type for the argument
of nfs_stat_to_errno().

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

 fs/nfs/internal.h |    2 +-
 fs/nfs/nfs2xdr.c  |   16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index c65ee43..01da8d4 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -179,7 +179,7 @@ extern int __init nfs_init_directcache(void);
 extern void nfs_destroy_directcache(void);
 
 /* nfs2xdr.c */
-extern int nfs_stat_to_errno(int);
+extern int nfs_stat_to_errno(enum nfs_stat);
 extern struct rpc_procinfo nfs_procedures[];
 extern __be32 * nfs_decode_dirent(__be32 *, struct nfs_entry *, int);
 
diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c
index 0a3f830..769e74e 100644
--- a/fs/nfs/nfs2xdr.c
+++ b/fs/nfs/nfs2xdr.c
@@ -870,20 +870,22 @@ static struct {
 	{ -1,			-EIO		}
 };
 
-/*
- * Convert an NFS error code to a local one.
- * This one is used jointly by NFSv2 and NFSv3.
+/**
+ * nfs_stat_to_errno - convert an NFS status code to a local errno
+ * @status: NFS status code to convert
+ *
+ * Returns a local errno value, or -EIO if the NFS status code is
+ * not recognized.  This function is used jointly by NFSv2 and NFSv3.
  */
-int
-nfs_stat_to_errno(int stat)
+int nfs_stat_to_errno(enum nfs_stat status)
 {
 	int i;
 
 	for (i = 0; nfs_errtbl[i].stat != -1; i++) {
-		if (nfs_errtbl[i].stat == stat)
+		if (nfs_errtbl[i].stat == (int)status)
 			return nfs_errtbl[i].errno;
 	}
-	dprintk("nfs_stat_to_errno: bad nfs status return value: %d\n", stat);
+	dprintk("NFS: Unrecognized nfs status value: %u\n", status);
 	return nfs_errtbl[i].errno;
 }
 


  parent reply	other threads:[~2010-09-10 20:09 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-10 20:08 [PATCH 00/11] Overhaul NFSv2-related XDR functions Chuck Lever
2010-09-10 20:08 ` [PATCH 01/11] NFS: Fix NFSv3 debugging messages in fs/nfs/nfs3proc.c Chuck Lever
2010-09-10 20:08 ` [PATCH 02/11] SUNRPC: Correct an rpcbind debugging message Chuck Lever
2010-09-10 20:09 ` [PATCH 03/11] SUNRPC: Refactor logic to NUL-terminate strings in pages Chuck Lever
2010-09-10 20:09 ` [PATCH 04/11] NFS: Introduce new-style XDR encoding functions for NFSv2 Chuck Lever
2010-09-13 19:52   ` Trond Myklebust
2010-09-13 20:00     ` Chuck Lever
2010-09-10 20:09 ` [PATCH 05/11] NFS: Remove old NFSv2 encoder functions Chuck Lever
2010-09-10 20:09 ` [PATCH 06/11] NFS: Move and update xdr_encode_foo() functions that we're keeping Chuck Lever
2010-09-10 20:09 ` Chuck Lever [this message]
2010-09-10 20:10 ` [PATCH 08/11] NFS: Introduce new-style XDR decoding functions for NFSv2 Chuck Lever
2010-09-10 20:10 ` [PATCH 09/11] NFS: Replace old NFSv2 decoder functions with xdr_stream-based ones Chuck Lever
2010-09-10 20:10 ` [PATCH 10/11] NFS: Move and update xdr_decode_foo() functions that we're keeping Chuck Lever
2010-09-10 20:10 ` [PATCH 11/11] lockd: Introduce new-style XDR functions for NLMv3 Chuck Lever

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100910200949.13321.70782.stgit@seurat.1015granger.net \
    --to=chuck.lever@oracle.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=trond.myklebust@netapp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.