From patchwork Sat Jan 19 01:13:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darrick Wong X-Patchwork-Id: 213765 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 B2A102C0080 for ; Sat, 19 Jan 2013 12:16:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753890Ab3ASBQV (ORCPT ); Fri, 18 Jan 2013 20:16:21 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:23561 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756099Ab3ASBOu (ORCPT ); Fri, 18 Jan 2013 20:14:50 -0500 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id r0J1DDEf012412 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 19 Jan 2013 01:13:14 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r0J1DBsg011319 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 19 Jan 2013 01:13:12 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id r0J1DB9a003780; Fri, 18 Jan 2013 19:13:11 -0600 Received: from localhost (/67.171.138.228) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 18 Jan 2013 17:13:10 -0800 Subject: [PATCH 5/6] ocfs2: Wait for page writeback to provide stable pages To: axboe@kernel.dk, lucho@ionkov.net, jack@suse.cz, darrick.wong@oracle.com, ericvh@gmail.com, viro@zeniv.linux.org.uk, rminnich@sandia.gov, tytso@mit.edu From: "Darrick J. Wong" Cc: martin.petersen@oracle.com, neilb@suse.de, Mark Fasheh , david@fromorbit.com, gnehzuil.liu@gmail.com, linux-kernel@vger.kernel.org, hch@infradead.org, linux-fsdevel@vger.kernel.org, adilger.kernel@dilger.ca, ocfs2-devel@oss.oracle.com, bharrosh@panasas.com, jlayton@samba.org, akpm@linux-foundation.org, linux-ext4@vger.kernel.org, hirofumi@mail.parknet.co.jp, Joel Becker Date: Fri, 18 Jan 2013 17:13:08 -0800 Message-ID: <20130119011308.20902.44871.stgit@blackbox.djwong.org> In-Reply-To: <20130119011231.20902.55954.stgit@blackbox.djwong.org> References: <20130119011231.20902.55954.stgit@blackbox.djwong.org> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org 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 ocfs2_grab_pages_for_write(). CC: ocfs2-devel@oss.oracle.com CC: Joel Becker CC: Mark Fasheh From: Jan Kara Signed-off-by: Jan Kara Signed-off-by: Darrick J. Wong Acked-by: Joel Becker --- fs/ocfs2/aops.c | 1 + 1 file changed, 1 insertion(+) -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 6577432..9796330 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -1194,6 +1194,7 @@ static int ocfs2_grab_pages_for_write(struct address_space *mapping, goto out; } } + wait_for_stable_page(wc->w_pages[i]); if (index == target_index) wc->w_target_page = wc->w_pages[i];