From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-gw0-f46.google.com ([74.125.83.46]:59796 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751783Ab0IQQ1Z (ORCPT ); Fri, 17 Sep 2010 12:27:25 -0400 Received: by gwj17 with SMTP id 17so784191gwj.19 for ; Fri, 17 Sep 2010 09:27:24 -0700 (PDT) From: Chuck Lever Subject: [PATCH 07/22] NFS: Use the "nfs_stat" enum for nfs_stat_to_errno()'s argument To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org Date: Fri, 17 Sep 2010 12:27:21 -0400 Message-ID: <20100917162721.19761.60553.stgit@seurat.1015granger.net> In-Reply-To: <20100917162204.19761.58249.stgit@seurat.1015granger.net> References: <20100917162204.19761.58249.stgit@seurat.1015granger.net> Content-Type: text/plain; charset="utf-8" Sender: linux-nfs-owner@vger.kernel.org List-ID: MIME-Version: 1.0 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 --- 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 fdfa3ef..186f591 100644 --- a/fs/nfs/nfs2xdr.c +++ b/fs/nfs/nfs2xdr.c @@ -863,20 +863,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; }