From patchwork Mon Dec 17 10:11:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 206808 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7B2E32C0093 for ; Mon, 17 Dec 2012 21:11:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751213Ab2LQKLr (ORCPT ); Mon, 17 Dec 2012 05:11:47 -0500 Received: from cantor2.suse.de ([195.135.220.15]:46570 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751013Ab2LQKLq (ORCPT ); Mon, 17 Dec 2012 05:11:46 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 8D80AA50DD; Mon, 17 Dec 2012 11:11:43 +0100 (CET) Received: by quack.suse.cz (Postfix, from userid 1000) id 5800720633; Mon, 17 Dec 2012 11:11:30 +0100 (CET) Date: Mon, 17 Dec 2012 11:11:30 +0100 From: Jan Kara To: "Darrick J. Wong" Cc: axboe@kernel.dk, lucho@ionkov.net, jack@suse.cz, ericvh@gmail.com, viro@zeniv.linux.org.uk, rminnich@sandia.gov, tytso@mit.edu, martin.petersen@oracle.com, neilb@suse.de, david@fromorbit.com, Zheng Liu , linux-kernel@vger.kernel.org, hch@infradead.org, linux-fsdevel@vger.kernel.org, adilger.kernel@dilger.ca, bharrosh@panasas.com, jlayton@samba.org, v9fs-developer@lists.sourceforge.net, linux-ext4@vger.kernel.org Subject: Re: [PATCH 3/4] 9pfs: Fix filesystem to wait for stable page writeback Message-ID: <20121217101130.GG5133@quack.suse.cz> References: <20121213080740.23360.16346.stgit@blackbox.djwong.org> <20121213080802.23360.4487.stgit@blackbox.djwong.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121213080802.23360.4487.stgit@blackbox.djwong.org> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org On Thu 13-12-12 00:08:02, Darrick J. Wong wrote: > Fix up the ->page_mkwrite handler to provide stable page writes if necessary. > > Signed-off-by: Darrick J. Wong Looks good. Also UBIFS and OCFS2 seem to need similar treatment. Patches attached... Honza > --- > fs/9p/vfs_file.c | 1 + > 1 file changed, 1 insertion(+) > > > diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c > index c2483e9..357260b 100644 > --- a/fs/9p/vfs_file.c > +++ b/fs/9p/vfs_file.c > @@ -620,6 +620,7 @@ v9fs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) > lock_page(page); > if (page->mapping != inode->i_mapping) > goto out_unlock; > + wait_for_stable_page(page); > > return VM_FAULT_LOCKED; > out_unlock: > From 988439f828b24fba8784cbd4d713d87cabd807cf Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 17 Dec 2012 11:08:11 +0100 Subject: [PATCH 2/2] ubifs: Wait for page writeback to provide stable pages When stable pages are required, we have to wait if the page is just going to disk and we want to modify it. Add proper callback to ubifs_vm_page_mkwrite(). CC: Artem Bityutskiy CC: Adrian Hunter CC: linux-mtd@lists.infradead.org Signed-off-by: Jan Kara --- fs/ubifs/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index 5bc7781..4f6493c 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -1522,6 +1522,7 @@ static int ubifs_vm_page_mkwrite(struct vm_area_struct *vma, ubifs_release_dirty_inode_budget(c, ui); } + wait_for_stable_page(page); unlock_page(page); return 0; -- 1.7.1