Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85828493 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

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: default avatarChuck Lever <chuck.lever@oracle.com>
Tested-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 282ac2a5

fs/nfs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,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(struct xdr_stream *, struct nfs_entry *, struct nfs_server *, int);

fs/nfs/nfs2xdr.c

+10 −8
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ nfs_xdr_statfsres(struct rpc_rqst *req, __be32 *p, struct nfs2_fsstat *res) 
 * We need to translate between nfs status return values and

 * the local errno values which may not be the same.

 */

static struct {

static const struct {

	int stat;

	int errno;

} nfs_errtbl[] = {
@@ -844,20 +844,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;

}