From patchwork Tue Jun 7 17:32:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858482 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 p57HW4Ef020963 for ; Tue, 7 Jun 2011 17:32:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757387Ab1FGRcn (ORCPT ); Tue, 7 Jun 2011 13:32:43 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:51554 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755451Ab1FGRcm (ORCPT ); Tue, 7 Jun 2011 13:32:42 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id 3AA82305A9CC; Tue, 7 Jun 2011 13:32:42 -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 hkDTY5libWZ7; Tue, 7 Jun 2011 13:32:42 -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 C67E03055B74; Tue, 7 Jun 2011 13:32:41 -0400 (EDT) Date: Tue, 7 Jun 2011 13:32:41 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 56/88] SQUASHME: pnfsblock: write_end adjust for removed ok_to_use_pnfs Message-ID: <72e4d418bdcfb139793744466fa77b0d77fd10e0.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:32:43 +0000 (UTC) From: Fred Isaman Signed-off-by: Fred Isaman --- fs/nfs/blocklayout/blocklayout.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index eb5760f..b1df445 100644 --- a/fs/nfs/blocklayout/blocklayout.c +++ b/fs/nfs/blocklayout/blocklayout.c @@ -1027,17 +1027,12 @@ bl_write_begin(struct pnfs_layout_segment *lseg, struct page *page, loff_t pos, /* CAREFUL - what happens if copied < count??? */ static int bl_write_end(struct inode *inode, struct page *page, loff_t pos, - unsigned count, unsigned copied, struct pnfs_fsdata *fsdata) + unsigned count, unsigned copied, struct pnfs_layout_segment *lseg) { - dprintk("%s enter, %u@%lld, %i\n", __func__, count, pos, - fsdata ? fsdata->ok_to_use_pnfs : -1); + dprintk("%s enter, %u@%lld, lseg=%p\n", __func__, count, pos, lseg); print_page(page); - if (fsdata) { - if (fsdata->ok_to_use_pnfs) { - dprintk("%s using pnfs\n", __func__); - SetPageUptodate(page); - } - } + if (lseg) + SetPageUptodate(page); return 0; }