From patchwork Tue Dec 14 14:55:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 409961 X-Patchwork-Delegate: Trond.Myklebust@netapp.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBEEstRp007667 for ; Tue, 14 Dec 2010 14:55:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757490Ab0LNOzF (ORCPT ); Tue, 14 Dec 2010 09:55:05 -0500 Received: from mail-gw0-f42.google.com ([74.125.83.42]:64762 "EHLO mail-gw0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757415Ab0LNOzE (ORCPT ); Tue, 14 Dec 2010 09:55:04 -0500 Received: by mail-gw0-f42.google.com with SMTP id 20so538996gwb.1 for ; Tue, 14 Dec 2010 06:55:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:subject:to:cc :date:message-id:in-reply-to:references:user-agent:mime-version :content-type:content-transfer-encoding; bh=ZevhYLxTI7MD9ILrb2LfW3VOGpiqZEonlLzZPOE1Xqk=; b=tqRf7+frrAzQAELUqXZhoo0duCjzBz+rpvjbVUnVQloMSjcF80fbmXEhaWNODRemQe BCXQsbPJaH0JvimLP1vQw6rTQNG6wXEf+Iqi6XCu7vVMt45u2W23JAhwFsYPlKUV/OzC jFrFp7MfLaM7K/eDFSCgi2moQ9i436g4mZ0ow= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:subject:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; b=I6ZvA1riSsSWMOoFR3KeKHrNzIILo+a6P3mxlRnuxJjEnr7Ucsd9H/5RMChJStI2fz vADwTdjR95IQV6WCgQubJsDyQZGXrs25XIjxZkhYOxj0bu3a7BzE3q/7USJ8lWD7AvjM EwMNEQLKt4KD7bSurYRP/iWRhEfHGTwKN6wME= Received: by 10.42.175.69 with SMTP id az5mr4363508icb.381.1292338503290; Tue, 14 Dec 2010 06:55:03 -0800 (PST) Received: from matisse.1015granger.net ([99.26.161.222]) by mx.google.com with ESMTPS id 34sm96431ibi.20.2010.12.14.06.55.01 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 14 Dec 2010 06:55:01 -0800 (PST) From: Chuck Lever Subject: [PATCH 04/31] 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: Tue, 14 Dec 2010 09:55:00 -0500 Message-ID: <20101214145500.2293.93090.stgit@matisse.1015granger.net> In-Reply-To: <20101214144747.2293.68070.stgit@matisse.1015granger.net> References: <20101214144747.2293.68070.stgit@matisse.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 14 Dec 2010 14:55:07 +0000 (UTC) diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index b8db6f9..5532acb 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -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); diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c index c799773..2da9824 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) * 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; }