From patchwork Wed Nov 17 17:45:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 333641 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 oAHHk3ea024796 for ; Wed, 17 Nov 2010 17:46:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935115Ab0KQRqB (ORCPT ); Wed, 17 Nov 2010 12:46:01 -0500 Received: from mail-pw0-f46.google.com ([209.85.160.46]:35191 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934635Ab0KQRqB (ORCPT ); Wed, 17 Nov 2010 12:46:01 -0500 Received: by pwj1 with SMTP id 1so275059pwj.19 for ; Wed, 17 Nov 2010 09:46:00 -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=qFgorYYYWzcooKvHM2lSkuRPzLpb5JH6UV3ZXOkqZJM=; b=cbK+6qm1oQe6+4GnyJStnWrq0+pr2BBcyxImvTCIIh9xtwHhWsnF0XMXuDXypuKvwN vx7jNStf3/HxGZSx/FiPXJrUgpDrVOlh0uQDnZszjp/FJ1mU1O1SP/ekNiTf2iEKK0v6 JU82O0BP6PAG/JKxuSxgZo4KexkuoY6+9AZ3U= 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=j5D7xyMIXqwHc4pdrGUTUEHS8FKYuVbgF1MD+56U7Nc7QT6P9oLNqsvvxPRF4QTh2r /xl53d8gA2hUTxce8T2v9PZYAZoPOmZMZCS1F1wqIzTYa9YZ/L1Nn395rGE8bM+ogOGA zsaNJtbTibcssrMea/xZN+56O9doJFoBaXHfU= Received: by 10.231.37.197 with SMTP id y5mr7262864ibd.151.1290015959644; Wed, 17 Nov 2010 09:45:59 -0800 (PST) Received: from matisse.1015granger.net (adsl-99-26-161-222.dsl.sfldmi.sbcglobal.net [99.26.161.222]) by mx.google.com with ESMTPS id d21sm2423726ibg.15.2010.11.17.09.45.57 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 17 Nov 2010 09:45:58 -0800 (PST) From: Chuck Lever Subject: [PATCH 14/17] NFS: Switch in new NFSv3 decoder functions To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org Date: Wed, 17 Nov 2010 12:45:56 -0500 Message-ID: <20101117174556.29177.90013.stgit@matisse.1015granger.net> In-Reply-To: <20101117174112.29177.69734.stgit@matisse.1015granger.net> References: <20101117174112.29177.69734.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]); Wed, 17 Nov 2010 17:46:04 +0000 (UTC) diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c index 570f04b..d7e7d5f 100644 --- a/fs/nfs/nfs3xdr.c +++ b/fs/nfs/nfs3xdr.c @@ -38,14 +38,10 @@ #define NFS3_path_sz (1+(NFS3_MAXPATHLEN>>2)) #define NFS3_fattr_sz (21) #define NFS3_cookieverf_sz (NFS3_COOKIEVERFSIZE>>2) -#define NFS3_wcc_attr_sz (6) +#define NFS3_wcc_attr_sz (6) #define NFS3_pre_op_attr_sz (1+NFS3_wcc_attr_sz) #define NFS3_post_op_attr_sz (1+NFS3_fattr_sz) -#define NFS3_wcc_data_sz (NFS3_pre_op_attr_sz+NFS3_post_op_attr_sz) -#define NFS3_fsstat_sz -#define NFS3_fsinfo_sz -#define NFS3_pathconf_sz -#define NFS3_entry_sz (NFS3_filename_sz+3) +#define NFS3_wcc_data_sz (NFS3_pre_op_attr_sz+NFS3_post_op_attr_sz) #define NFS3_diropargs_sz (NFS3_fh_sz+NFS3_filename_sz) #define NFS3_getattrargs_sz (NFS3_fh_sz) @@ -66,9 +62,9 @@ #define NFS3_readdirplusargs_sz (NFS3_fh_sz+NFS3_cookieverf_sz+4) #define NFS3_commitargs_sz (NFS3_fh_sz+3) -#define NFS3_attrstat_sz (1+NFS3_fattr_sz) -#define NFS3_wccstat_sz (1+NFS3_wcc_data_sz) -#define NFS3_removeres_sz (NFS3_wccstat_sz) +#define NFS3_getattrres_sz (1+NFS3_fattr_sz) +#define NFS3_setattrres_sz (1+NFS3_wcc_data_sz) +#define NFS3_removeres_sz (NFS3_setattrres_sz) #define NFS3_lookupres_sz (1+NFS3_fh_sz+(2 * NFS3_post_op_attr_sz)) #define NFS3_accessres_sz (1+NFS3_post_op_attr_sz+1) #define NFS3_readlinkres_sz (1+NFS3_post_op_attr_sz+1) @@ -3013,36 +3009,36 @@ out_default: [NFS3PROC_##proc] = { \ .p_proc = NFS3PROC_##proc, \ .p_encode = (kxdrproc_t)nfs3_xdr_enc_##argtype##3args, \ - .p_decode = (kxdrproc_t) nfs3_xdr_##restype, \ + .p_decode = (kxdrproc_t)nfs3_xdr_dec_##restype##3res, \ .p_arglen = NFS3_##argtype##args_sz, \ - .p_replen = NFS3_##restype##_sz, \ + .p_replen = NFS3_##restype##res_sz, \ .p_timer = timer, \ .p_statidx = NFS3PROC_##proc, \ .p_name = #proc, \ } struct rpc_procinfo nfs3_procedures[] = { - PROC(GETATTR, getattr, attrstat, 1), - PROC(SETATTR, setattr, wccstat, 0), - PROC(LOOKUP, lookup, lookupres, 2), - PROC(ACCESS, access, accessres, 1), - PROC(READLINK, readlink, readlinkres, 3), - PROC(READ, read, readres, 3), - PROC(WRITE, write, writeres, 4), - PROC(CREATE, create, createres, 0), - PROC(MKDIR, mkdir, createres, 0), - PROC(SYMLINK, symlink, createres, 0), - PROC(MKNOD, mknod, createres, 0), - PROC(REMOVE, remove, removeres, 0), - PROC(RMDIR, lookup, wccstat, 0), - PROC(RENAME, rename, renameres, 0), - PROC(LINK, link, linkres, 0), - PROC(READDIR, readdir, readdirres, 3), - PROC(READDIRPLUS, readdirplus, readdirres, 3), - PROC(FSSTAT, getattr, fsstatres, 0), - PROC(FSINFO, getattr, fsinfores, 0), - PROC(PATHCONF, getattr, pathconfres, 0), - PROC(COMMIT, commit, commitres, 5), + PROC(GETATTR, getattr, getattr, 1), + PROC(SETATTR, setattr, setattr, 0), + PROC(LOOKUP, lookup, lookup, 2), + PROC(ACCESS, access, access, 1), + PROC(READLINK, readlink, readlink, 3), + PROC(READ, read, read, 3), + PROC(WRITE, write, write, 4), + PROC(CREATE, create, create, 0), + PROC(MKDIR, mkdir, create, 0), + PROC(SYMLINK, symlink, create, 0), + PROC(MKNOD, mknod, create, 0), + PROC(REMOVE, remove, remove, 0), + PROC(RMDIR, lookup, setattr, 0), + PROC(RENAME, rename, rename, 0), + PROC(LINK, link, link, 0), + PROC(READDIR, readdir, readdir, 3), + PROC(READDIRPLUS, readdirplus, readdir, 3), + PROC(FSSTAT, getattr, fsstat, 0), + PROC(FSINFO, getattr, fsinfo, 0), + PROC(PATHCONF, getattr, pathconf, 0), + PROC(COMMIT, commit, commit, 5), }; struct rpc_version nfs_version3 = { @@ -3056,7 +3052,7 @@ static struct rpc_procinfo nfs3_acl_procedures[] = { [ACLPROC3_GETACL] = { .p_proc = ACLPROC3_GETACL, .p_encode = (kxdrproc_t)nfs3_xdr_enc_getacl3args, - .p_decode = (kxdrproc_t) nfs3_xdr_getaclres, + .p_decode = (kxdrproc_t)nfs3_xdr_dec_getacl3res, .p_arglen = ACL3_getaclargs_sz, .p_replen = ACL3_getaclres_sz, .p_timer = 1, @@ -3065,7 +3061,7 @@ static struct rpc_procinfo nfs3_acl_procedures[] = { [ACLPROC3_SETACL] = { .p_proc = ACLPROC3_SETACL, .p_encode = (kxdrproc_t)nfs3_xdr_enc_setacl3args, - .p_decode = (kxdrproc_t) nfs3_xdr_setaclres, + .p_decode = (kxdrproc_t)nfs3_xdr_dec_setacl3res, .p_arglen = ACL3_setaclargs_sz, .p_replen = ACL3_setaclres_sz, .p_timer = 0,