From patchwork Tue Jun 7 17:35:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858752 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 p57HZlNX022861 for ; Tue, 7 Jun 2011 17:35:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756753Ab1FGRfj (ORCPT ); Tue, 7 Jun 2011 13:35:39 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:44042 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756044Ab1FGRfi (ORCPT ); Tue, 7 Jun 2011 13:35:38 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id 6FD00305B849; Tue, 7 Jun 2011 13:35:37 -0400 (EDT) X-Virus-Scanned: amavisd-new at int-mailstore01.merit.edu Received: from int-mailstore01.merit.edu ([127.0.0.1]) by localhost (int-mailstore01.merit.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RpPtXzqlGsP0; Tue, 7 Jun 2011 13:35:37 -0400 (EDT) Received: from merit.edu (host-17.subnet-17.med.umich.edu [141.214.17.17]) by int-mailstore01.merit.edu (Postfix) with ESMTPSA id E7A41305A9D2; Tue, 7 Jun 2011 13:35:36 -0400 (EDT) Date: Tue, 7 Jun 2011 13:35:36 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 83/88] SQUASHME: pnfs-block: fixup layoutcommit methods args Message-ID: <3d0a1f2e487c14932f25ccc4144e6e89a0e06bc7.1307464382.git.rees@umich.edu> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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.6 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Jun 2011 17:35:47 +0000 (UTC) From: Benny Halevy Signed-off-by: Benny Halevy --- fs/nfs/blocklayout/blocklayout.c | 11 +++++------ fs/nfs/blocklayout/blocklayout.h | 4 ++-- fs/nfs/blocklayout/extents.c | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index 39f3896..161c113 100644 --- a/fs/nfs/blocklayout/blocklayout.c +++ b/fs/nfs/blocklayout/blocklayout.c @@ -617,7 +617,7 @@ bl_alloc_lseg(struct pnfs_layout_hdr *lo, static int bl_setup_layoutcommit(struct pnfs_layout_hdr *lo, - struct nfs4_layoutcommit_op_args *arg) + struct nfs4_layoutcommit_args *arg) { struct nfs_server *nfss = NFS_SERVER(lo->inode); struct bl_layoutupdate_data *layoutupdate_data; @@ -645,7 +645,7 @@ bl_setup_layoutcommit(struct pnfs_layout_hdr *lo, static void bl_encode_layoutcommit(struct pnfs_layout_hdr *lo, struct xdr_stream *xdr, - const struct nfs4_layoutcommit_op_args *arg) + const struct nfs4_layoutcommit_args *arg) { dprintk("%s enter\n", __func__); encode_pnfs_block_layoutupdate(BLK_LO2EXT(lo), xdr, arg); @@ -653,12 +653,11 @@ bl_encode_layoutcommit(struct pnfs_layout_hdr *lo, struct xdr_stream *xdr, static void bl_cleanup_layoutcommit(struct pnfs_layout_hdr *lo, - struct nfs4_layoutcommit_op_args *arg, - struct nfs4_layoutcommit_op_res *res) + struct nfs4_layoutcommit_data *lcdata) { dprintk("%s enter\n", __func__); - clean_pnfs_block_layoutupdate(BLK_LO2EXT(lo), arg, res->status); - kfree(arg->layoutdriver_data); + clean_pnfs_block_layoutupdate(BLK_LO2EXT(lo), &lcdata->args, lcdata->res.status); + kfree(lcdata->args.layoutdriver_data); } static void free_blk_mountid(struct block_mount_id *mid) diff --git a/fs/nfs/blocklayout/blocklayout.h b/fs/nfs/blocklayout/blocklayout.h index 058c198..9e7bd62 100644 --- a/fs/nfs/blocklayout/blocklayout.h +++ b/fs/nfs/blocklayout/blocklayout.h @@ -276,9 +276,9 @@ struct pnfs_block_extent *get_extent(struct pnfs_block_extent *be); int is_sector_initialized(struct pnfs_inval_markings *marks, sector_t isect); int encode_pnfs_block_layoutupdate(struct pnfs_block_layout *bl, struct xdr_stream *xdr, - const struct nfs4_layoutcommit_op_args *arg); + const struct nfs4_layoutcommit_args *arg); void clean_pnfs_block_layoutupdate(struct pnfs_block_layout *bl, - const struct nfs4_layoutcommit_op_args *arg, + const struct nfs4_layoutcommit_args *arg, int status); int add_and_merge_extent(struct pnfs_block_layout *bl, struct pnfs_block_extent *new); diff --git a/fs/nfs/blocklayout/extents.c b/fs/nfs/blocklayout/extents.c index cd32935..40dff82 100644 --- a/fs/nfs/blocklayout/extents.c +++ b/fs/nfs/blocklayout/extents.c @@ -738,7 +738,7 @@ find_get_extent_locked(struct pnfs_block_layout *bl, sector_t isect) int encode_pnfs_block_layoutupdate(struct pnfs_block_layout *bl, struct xdr_stream *xdr, - const struct nfs4_layoutcommit_op_args *arg) + const struct nfs4_layoutcommit_args *arg) { sector_t start, end; struct pnfs_block_short_extent *lce, *save; @@ -922,7 +922,7 @@ set_to_rw(struct pnfs_block_layout *bl, u64 offset, u64 length) void clean_pnfs_block_layoutupdate(struct pnfs_block_layout *bl, - const struct nfs4_layoutcommit_op_args *arg, + const struct nfs4_layoutcommit_args *arg, int status) { struct bl_layoutupdate_data *bld = arg->layoutdriver_data;