From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Howells Subject: [PATCH 03/30] NFS: Disambiguate nfs_stat_to_errno() [try #11] Date: Thu, 27 Jul 2006 21:52:32 +0100 Message-ID: <20060727205232.8443.14318.stgit@warthog.cambridge.redhat.com> References: <20060727205222.8443.29381.stgit@warthog.cambridge.redhat.com> Reply-To: Linux filesystem caching discussion list Content-Type: text/plain; charset=utf-8; format=fixed Content-Transfer-Encoding: quoted-printable Cc: linux-fsdevel@vger.kernel.org, linux-cachefs@redhat.com, nfsv4@linux-nfs.org, linux-kernel@vger.kernel.org Return-path: To: torvalds@osdl.org, akpm@osdl.org, steved@redhat.com, trond.myklebust@fys.uio.no In-Reply-To: <20060727205222.8443.29381.stgit@warthog.cambridge.redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-cachefs-bounces@redhat.com Errors-To: linux-cachefs-bounces@redhat.com List-Id: linux-fsdevel.vger.kernel.org Rename the NFS4 version of nfs_stat_to_errno() so that it doesn't conflic= t with the common one used by NFS2 and NFS3. Signed-Off-By: David Howells Signed-off-by: Trond Myklebust --- 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 1750d99..14377f2 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -58,7 +58,7 @@ #define NFSDBG_FACILITY NFSDBG_XDR /* Mapping from NFS error code to "errno" error code. */ #define errno_NFSERR_IO EIO =20 -static int nfs_stat_to_errno(int); +static int nfs4_stat_to_errno(int); =20 /* NFSv4 COMPOUND tags are only wanted for debugging purposes */ #ifdef DEBUG @@ -2127,7 +2127,7 @@ static int decode_op_hdr(struct xdr_stre } READ32(nfserr); if (nfserr !=3D NFS_OK) - return -nfs_stat_to_errno(nfserr); + return -nfs4_stat_to_errno(nfserr); return 0; } =20 @@ -3597,7 +3597,7 @@ static int decode_setclientid(struct xdr READ_BUF(len); return -NFSERR_CLID_INUSE; } else - return -nfs_stat_to_errno(nfserr); + return -nfs4_stat_to_errno(nfserr); =20 return 0; } @@ -4255,7 +4255,7 @@ static int nfs4_xdr_dec_fsinfo(struct rp if (!status) status =3D decode_fsinfo(&xdr, fsinfo); if (!status) - status =3D -nfs_stat_to_errno(hdr.status); + status =3D -nfs4_stat_to_errno(hdr.status); return status; } =20 @@ -4345,7 +4345,7 @@ static int nfs4_xdr_dec_setclientid(stru if (!status) status =3D decode_setclientid(&xdr, clp); if (!status) - status =3D -nfs_stat_to_errno(hdr.status); + status =3D -nfs4_stat_to_errno(hdr.status); return status; } =20 @@ -4367,7 +4367,7 @@ static int nfs4_xdr_dec_setclientid_conf if (!status) status =3D decode_fsinfo(&xdr, fsinfo); if (!status) - status =3D -nfs_stat_to_errno(hdr.status); + status =3D -nfs4_stat_to_errno(hdr.status); return status; } =20 @@ -4520,7 +4520,7 @@ static struct { * This one is used jointly by NFSv2 and NFSv3. */ static int -nfs_stat_to_errno(int stat) +nfs4_stat_to_errno(int stat) { int i; for (i =3D 0; nfs_errtbl[i].stat !=3D -1; i++) {