diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2010-12-14 09:55:00 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-12-16 12:37:21 -0500 |
commit | 858284932462cec260f3d1d7426aeb03f5dbc2ad (patch) | |
tree | 4091fe326b0b96eaa25fb766111b922ada5b3773 /fs/nfs/nfs2xdr.c | |
parent | 282ac2a573dd1be4230710932cd471ed5a3a94b8 (diff) |
NFS: Use the "nfs_stat" enum for nfs_stat_to_errno()'s argument
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().
Add a documenting comment appropriate for a global function shared
outside this source file.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs2xdr.c')
-rw-r--r-- | fs/nfs/nfs2xdr.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c index c79977304af8..2da9824d432a 100644 --- a/fs/nfs/nfs2xdr.c +++ b/fs/nfs/nfs2xdr.c | |||
@@ -804,7 +804,7 @@ nfs_xdr_statfsres(struct rpc_rqst *req, __be32 *p, struct nfs2_fsstat *res) | |||
804 | * We need to translate between nfs status return values and | 804 | * We need to translate between nfs status return values and |
805 | * the local errno values which may not be the same. | 805 | * the local errno values which may not be the same. |
806 | */ | 806 | */ |
807 | static struct { | 807 | static const struct { |
808 | int stat; | 808 | int stat; |
809 | int errno; | 809 | int errno; |
810 | } nfs_errtbl[] = { | 810 | } nfs_errtbl[] = { |
@@ -844,20 +844,22 @@ static struct { | |||
844 | { -1, -EIO } | 844 | { -1, -EIO } |
845 | }; | 845 | }; |
846 | 846 | ||
847 | /* | 847 | /** |
848 | * Convert an NFS error code to a local one. | 848 | * nfs_stat_to_errno - convert an NFS status code to a local errno |
849 | * This one is used jointly by NFSv2 and NFSv3. | 849 | * @status: NFS status code to convert |
850 | * | ||
851 | * Returns a local errno value, or -EIO if the NFS status code is | ||
852 | * not recognized. This function is used jointly by NFSv2 and NFSv3. | ||
850 | */ | 853 | */ |
851 | int | 854 | int nfs_stat_to_errno(enum nfs_stat status) |
852 | nfs_stat_to_errno(int stat) | ||
853 | { | 855 | { |
854 | int i; | 856 | int i; |
855 | 857 | ||
856 | for (i = 0; nfs_errtbl[i].stat != -1; i++) { | 858 | for (i = 0; nfs_errtbl[i].stat != -1; i++) { |
857 | if (nfs_errtbl[i].stat == stat) | 859 | if (nfs_errtbl[i].stat == (int)status) |
858 | return nfs_errtbl[i].errno; | 860 | return nfs_errtbl[i].errno; |
859 | } | 861 | } |
860 | dprintk("nfs_stat_to_errno: bad nfs status return value: %d\n", stat); | 862 | dprintk("NFS: Unrecognized nfs status value: %u\n", status); |
861 | return nfs_errtbl[i].errno; | 863 | return nfs_errtbl[i].errno; |
862 | } | 864 | } |
863 | 865 | ||