On Thu, 24 Mar 2011 13:55:24 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 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@xxxxxxxxxxxxxxxx
>
> 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;
> }
I did the cleancache_flush_page() before the delete_from_page_cache(),
in case the delete_from_page_cache() freed the page. I didn't actually
check whether that makes sense though.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
