diff options
author | David Howells <dhowells@redhat.com> | 2006-08-22 20:06:08 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-09-22 23:24:30 -0400 |
commit | 0a8ea4372b2868842986118ca90912f3382e6c5a (patch) | |
tree | 06d0641bf6d5906c28814c672ce43697467fa03d /fs/nfs | |
parent | 7d4e2747a0412583526a162fbbd6edeeafcceb08 (diff) |
NFS: Disambiguate nfs_stat_to_errno()
Rename the NFS4 version of nfs_stat_to_errno() so that it doesn't conflict with
the common one used by NFS2 and NFS3.
Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/nfs4xdr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 730ec8fb31c6..1dee6ef7e5a9 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c | |||
@@ -58,7 +58,7 @@ | |||
58 | /* Mapping from NFS error code to "errno" error code. */ | 58 | /* Mapping from NFS error code to "errno" error code. */ |
59 | #define errno_NFSERR_IO EIO | 59 | #define errno_NFSERR_IO EIO |
60 | 60 | ||
61 | static int nfs_stat_to_errno(int); | 61 | static int nfs4_stat_to_errno(int); |
62 | 62 | ||
63 | /* NFSv4 COMPOUND tags are only wanted for debugging purposes */ | 63 | /* NFSv4 COMPOUND tags are only wanted for debugging purposes */ |
64 | #ifdef DEBUG | 64 | #ifdef DEBUG |
@@ -2127,7 +2127,7 @@ static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) | |||
2127 | } | 2127 | } |
2128 | READ32(nfserr); | 2128 | READ32(nfserr); |
2129 | if (nfserr != NFS_OK) | 2129 | if (nfserr != NFS_OK) |
2130 | return -nfs_stat_to_errno(nfserr); | 2130 | return -nfs4_stat_to_errno(nfserr); |
2131 | return 0; | 2131 | return 0; |
2132 | } | 2132 | } |
2133 | 2133 | ||
@@ -3598,7 +3598,7 @@ static int decode_setclientid(struct xdr_stream *xdr, struct nfs4_client *clp) | |||
3598 | READ_BUF(len); | 3598 | READ_BUF(len); |
3599 | return -NFSERR_CLID_INUSE; | 3599 | return -NFSERR_CLID_INUSE; |
3600 | } else | 3600 | } else |
3601 | return -nfs_stat_to_errno(nfserr); | 3601 | return -nfs4_stat_to_errno(nfserr); |
3602 | 3602 | ||
3603 | return 0; | 3603 | return 0; |
3604 | } | 3604 | } |
@@ -4256,7 +4256,7 @@ static int nfs4_xdr_dec_fsinfo(struct rpc_rqst *req, uint32_t *p, struct nfs_fsi | |||
4256 | if (!status) | 4256 | if (!status) |
4257 | status = decode_fsinfo(&xdr, fsinfo); | 4257 | status = decode_fsinfo(&xdr, fsinfo); |
4258 | if (!status) | 4258 | if (!status) |
4259 | status = -nfs_stat_to_errno(hdr.status); | 4259 | status = -nfs4_stat_to_errno(hdr.status); |
4260 | return status; | 4260 | return status; |
4261 | } | 4261 | } |
4262 | 4262 | ||
@@ -4346,7 +4346,7 @@ static int nfs4_xdr_dec_setclientid(struct rpc_rqst *req, uint32_t *p, | |||
4346 | if (!status) | 4346 | if (!status) |
4347 | status = decode_setclientid(&xdr, clp); | 4347 | status = decode_setclientid(&xdr, clp); |
4348 | if (!status) | 4348 | if (!status) |
4349 | status = -nfs_stat_to_errno(hdr.status); | 4349 | status = -nfs4_stat_to_errno(hdr.status); |
4350 | return status; | 4350 | return status; |
4351 | } | 4351 | } |
4352 | 4352 | ||
@@ -4368,7 +4368,7 @@ static int nfs4_xdr_dec_setclientid_confirm(struct rpc_rqst *req, uint32_t *p, s | |||
4368 | if (!status) | 4368 | if (!status) |
4369 | status = decode_fsinfo(&xdr, fsinfo); | 4369 | status = decode_fsinfo(&xdr, fsinfo); |
4370 | if (!status) | 4370 | if (!status) |
4371 | status = -nfs_stat_to_errno(hdr.status); | 4371 | status = -nfs4_stat_to_errno(hdr.status); |
4372 | return status; | 4372 | return status; |
4373 | } | 4373 | } |
4374 | 4374 | ||
@@ -4521,7 +4521,7 @@ static struct { | |||
4521 | * This one is used jointly by NFSv2 and NFSv3. | 4521 | * This one is used jointly by NFSv2 and NFSv3. |
4522 | */ | 4522 | */ |
4523 | static int | 4523 | static int |
4524 | nfs_stat_to_errno(int stat) | 4524 | nfs4_stat_to_errno(int stat) |
4525 | { | 4525 | { |
4526 | int i; | 4526 | int i; |
4527 | for (i = 0; nfs_errtbl[i].stat != -1; i++) { | 4527 | for (i = 0; nfs_errtbl[i].stat != -1; i++) { |