From patchwork Tue Jun 7 17:35:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858732 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 p57HYqWf022392 for ; Tue, 7 Jun 2011 17:35:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756779Ab1FGRf0 (ORCPT ); Tue, 7 Jun 2011 13:35:26 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:43972 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756691Ab1FGRf0 (ORCPT ); Tue, 7 Jun 2011 13:35:26 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id 2D817305A9CC; Tue, 7 Jun 2011 13:35:26 -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 9yVj1KkEh9sd; Tue, 7 Jun 2011 13:35:25 -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 AF010305A9D2; Tue, 7 Jun 2011 13:35:25 -0400 (EDT) Date: Tue, 7 Jun 2011 13:35:24 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 81/88] SQUASHME: pnfs-block: fixup cleanup_layoutcommit arguments Message-ID: <9384871254203cc17eaf6b256dc47049cf57b1f4.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:27 +0000 (UTC) From: Benny Halevy Signed-off-by: Benny Halevy --- fs/nfs/blocklayout/blocklayout.c | 5 +++-- fs/nfs/blocklayout/blocklayout.h | 2 +- fs/nfs/blocklayout/extents.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index ff94ee2..1865392 100644 --- a/fs/nfs/blocklayout/blocklayout.c +++ b/fs/nfs/blocklayout/blocklayout.c @@ -653,10 +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_args *arg, int status) + struct nfs4_layoutcommit_op_args *arg, + struct nfs4_layoutcommit_op_res *res) { dprintk("%s enter\n", __func__); - clean_pnfs_block_layoutupdate(BLK_LO2EXT(lo), arg, status); + clean_pnfs_block_layoutupdate(BLK_LO2EXT(lo), arg, res->status); kfree(arg->layoutdriver_data); } diff --git a/fs/nfs/blocklayout/blocklayout.h b/fs/nfs/blocklayout/blocklayout.h index 9e7bd62..4266ae7 100644 --- a/fs/nfs/blocklayout/blocklayout.h +++ b/fs/nfs/blocklayout/blocklayout.h @@ -278,7 +278,7 @@ int encode_pnfs_block_layoutupdate(struct pnfs_block_layout *bl, struct xdr_stream *xdr, const struct nfs4_layoutcommit_args *arg); void clean_pnfs_block_layoutupdate(struct pnfs_block_layout *bl, - const struct nfs4_layoutcommit_args *arg, + const struct nfs4_layoutcommit_op_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 40dff82..0ff65f3 100644 --- a/fs/nfs/blocklayout/extents.c +++ b/fs/nfs/blocklayout/extents.c @@ -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_args *arg, + const struct nfs4_layoutcommit_op_args *arg, int status) { struct bl_layoutupdate_data *bld = arg->layoutdriver_data;