From patchwork Tue Jun 7 17:35:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858722 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 p57HYqWe022392 for ; Tue, 7 Jun 2011 17:35:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756777Ab1FGRfW (ORCPT ); Tue, 7 Jun 2011 13:35:22 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:52595 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756691Ab1FGRfW (ORCPT ); Tue, 7 Jun 2011 13:35:22 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id 302C73055B74; Tue, 7 Jun 2011 13:35:22 -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 1t7sUVyBgqOU; Tue, 7 Jun 2011 13:35:20 -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 DB4B43083A6D; Tue, 7 Jun 2011 13:35:19 -0400 (EDT) Date: Tue, 7 Jun 2011 13:35:19 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 80/88] SQUASHME: pnfs-block: fixup setup_layoutcommit arguments Message-ID: <0a87173438422d20c18b5b9783a7eb71296ecd7b.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:23 +0000 (UTC) From: Benny Halevy Signed-off-by: Benny Halevy --- fs/nfs/blocklayout/blocklayout.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index 5f11fb8..ff94ee2 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_args *arg) + struct nfs4_layoutcommit_op_args *arg) { struct nfs_server *nfss = NFS_SERVER(lo->inode); struct bl_layoutupdate_data *layoutupdate_data;