From patchwork Sun Jun 12 23:44:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 873542 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5CNhqAE007930 for ; Sun, 12 Jun 2011 23:45:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754710Ab1FLXpA (ORCPT ); Sun, 12 Jun 2011 19:45:00 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:45687 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754707Ab1FLXpA (ORCPT ); Sun, 12 Jun 2011 19:45:00 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id DAC44308EFAA; Sun, 12 Jun 2011 19:44:59 -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 HgIySCafQViA; Sun, 12 Jun 2011 19:44:59 -0400 (EDT) Received: from merit.edu (74-126-0-171.static.123.net [74.126.0.171]) by int-mailstore01.merit.edu (Postfix) with ESMTPSA id 44A723084FE6; Sun, 12 Jun 2011 19:44:59 -0400 (EDT) X-Mailbox-Line: From 5242eddc4e010fb8a1dadd050ff6ec0ab6f3dd27 Mon Sep 17 00:00:00 2001 Message-Id: <5242eddc4e010fb8a1dadd050ff6ec0ab6f3dd27.1307921138.git.rees@umich.edu> In-Reply-To: References: Date: Sun, 12 Jun 2011 19:44:58 -0400 Subject: [PATCH 28/34] pnfsblock: write_end_cleanup From: Jim Rees To: linux-nfs@vger.kernel.org Cc: peter honeyman 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]); Sun, 12 Jun 2011 23:45:11 +0000 (UTC) From: Fred Isaman Ensure all pages in block are marked for initialization if needed. [pnfsblock: Update to 2.6.29] [pnfsblock: write_end_cleanup adjust for removed ok_to_use_pnfs] Signed-off-by: Fred Isaman Signed-off-by: Benny Halevy --- fs/nfs/blocklayout/blocklayout.c | 54 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index 8914143..a40616b 100644 --- a/fs/nfs/blocklayout/blocklayout.c +++ b/fs/nfs/blocklayout/blocklayout.c @@ -794,6 +794,60 @@ bl_write_end(struct inode *inode, struct page *page, loff_t pos, static void bl_write_end_cleanup(struct file *filp, struct pnfs_fsdata *fsdata) { + struct page *page; + pgoff_t index; + sector_t *pos; + struct address_space *mapping = filp->f_mapping; + struct pnfs_fsdata *fake_data; + struct pnfs_layout_segment *lseg; + + if (!fsdata) + return; + lseg = fsdata->lseg; + if (!lseg) + return; + pos = fsdata->private; + if (!pos) + return; + dprintk("%s enter with pos=%llu\n", __func__, (u64)(*pos)); + for (; *pos != ~0; pos++) { + index = *pos >> (PAGE_CACHE_SHIFT - 9); + /* XXX How do we properly deal with failures here??? */ + page = grab_cache_page_write_begin(mapping, index, 0); + if (!page) { + printk(KERN_ERR "%s BUG BUG BUG NoMem\n", __func__); + continue; + } + dprintk("%s: Examining block page\n", __func__); + print_page(page); + if (!PageMappedToDisk(page)) { + /* XXX How do we properly deal with failures here??? */ + dprintk("%s Marking block page\n", __func__); + init_page_for_write(BLK_LSEG2EXT(fsdata->lseg), page, + PAGE_CACHE_SIZE, PAGE_CACHE_SIZE, + NULL); + print_page(page); + fake_data = kzalloc(sizeof(*fake_data), GFP_KERNEL); + if (!fake_data) { + printk(KERN_ERR "%s BUG BUG BUG NoMem\n", + __func__); + unlock_page(page); + continue; + } + get_lseg(lseg); + fake_data->lseg = lseg; + fake_data->bypass_eof = 1; + mapping->a_ops->write_end(filp, mapping, + index << PAGE_CACHE_SHIFT, + PAGE_CACHE_SIZE, + PAGE_CACHE_SIZE, + page, fake_data); + /* Note fake_data is freed by nfs_write_end */ + } else + unlock_page(page); + } + kfree(fsdata->private); + fsdata->private = NULL; } static struct pnfs_layoutdriver_type blocklayout_type = {