From patchwork Tue Jun 7 17:33:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858542 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p57HXFxs015750 for ; Tue, 7 Jun 2011 17:33:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755217Ab1FGRdZ (ORCPT ); Tue, 7 Jun 2011 13:33:25 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:51784 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754744Ab1FGRdZ (ORCPT ); Tue, 7 Jun 2011 13:33:25 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id F04A93083A6D; Tue, 7 Jun 2011 13:33:24 -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 hqNR+3jjpIyt; Tue, 7 Jun 2011 13:33:24 -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 8AF933055B74; Tue, 7 Jun 2011 13:33:24 -0400 (EDT) Date: Tue, 7 Jun 2011 13:33:23 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 62/88] SQUASHME: pnfs-block: use new commit api Message-ID: 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 (demeter2.kernel.org [140.211.167.43]); Tue, 07 Jun 2011 17:33:26 +0000 (UTC) From: Benny Halevy Signed-off-by: Benny Halevy --- fs/nfs/blocklayout/blocklayout.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index 63d3b5a..e2ee90a 100644 --- a/fs/nfs/blocklayout/blocklayout.c +++ b/fs/nfs/blocklayout/blocklayout.c @@ -99,9 +99,8 @@ dont_like_caller(struct nfs_page *req) } static enum pnfs_try_status -bl_commit(struct pnfs_layout_type *lo, - int sync, - struct nfs_write_data *nfs_data) +bl_commit(struct nfs_write_data *nfs_data, + int sync) { dprintk("%s enter\n", __func__); return PNFS_NOT_ATTEMPTED;