Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932705Ab1CXCzb (ORCPT ); Wed, 23 Mar 2011 22:55:31 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:46674 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932115Ab1CXCza (ORCPT ); Wed, 23 Mar 2011 22:55:30 -0400 Date: Thu, 24 Mar 2011 13:55:24 +1100 From: Stephen Rothwell To: Dan Magenheimer Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Minchan Kim , Andrew Morton , Linus Subject: linux-next: manual merge of the cleancache tree with Linus' tree Message-Id: <20110324135524.261bb5a9.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.1.0 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1339 Lines: 39 Hi Dan, Today's linux-next merge of the cleancache tree got a conflict in mm/truncate.c between commit 5adc7b518b54 ("mm: truncate: change remove_from_page_cache") from Linus' tree and commit 03e838947c8a ("mm/fs: add hooks to support cleancache") from the cleancache tree. I fixed it up (see below) but am really not sure of the fix. I can carry this fix as necessary. Is this stuff going to be merged into Linus' tree this time round? -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc mm/truncate.c index a956675,cd94607..0000000 --- a/mm/truncate.c +++ b/mm/truncate.c @@@ -106,8 -108,13 +108,12 @@@ truncate_complete_page(struct address_s cancel_dirty_page(page, PAGE_CACHE_SIZE); clear_page_mlock(page); - remove_from_page_cache(page); ClearPageMappedToDisk(page); + delete_from_page_cache(page); + /* this must be after the remove_from_page_cache which + * calls cleancache_put_page (and note page->mapping is now NULL) + */ + cleancache_flush_page(mapping, page); - page_cache_release(page); /* pagecache ref */ return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/