The patch titled Reiser4: reiser4_drop_page: don't call remove_from_page_cache has been added to the -mm tree. Its filename is reiser4-reiser4_drop_page-dont-call-remove_from_page_cache.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: Reiser4: reiser4_drop_page: don't call remove_from_page_cache From: Alexander Zarochentsev <zam@xxxxxxxxxxx> this patch addresses the following reiser4_drop_page problem : > drop_page() is a worry. Why _does_ reiser4 need to remove pages from > pagecache? That isn't a filesystem function. Signed-off-by: Alexander Zarochentsev <zam@xxxxxxxxxxx> Cc: Hans Reiser <reiser@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- fs/reiser4/page_cache.c | 8 +------- 1 files changed, 1 insertion(+), 7 deletions(-) diff -puN fs/reiser4/page_cache.c~reiser4-reiser4_drop_page-dont-call-remove_from_page_cache fs/reiser4/page_cache.c --- a/fs/reiser4/page_cache.c~reiser4-reiser4_drop_page-dont-call-remove_from_page_cache +++ a/fs/reiser4/page_cache.c @@ -261,7 +261,6 @@ void done_formatted_fake(struct super_bl sinfo = get_super_private_nocheck(super); if (sinfo->fake != NULL) { - assert("vs-1426", sinfo->fake->i_data.nrpages == 0); iput(sinfo->fake); sinfo->fake = NULL; } @@ -589,12 +588,7 @@ void drop_page(struct page *page) #if defined(PG_skipped) ClearPageSkipped(page); #endif - if (page->mapping != NULL) { - remove_from_page_cache(page); - unlock_page(page); - page_cache_release(page); - } else - unlock_page(page); + unlock_page(page); } /* this is called by truncate_jnodes_range which in its turn is always called _ Patches currently in -mm which might be from zam@xxxxxxxxxxx are reiser4-reiser4_drop_page-dont-call-remove_from_page_cache.patch reiser4-decribe-new-atom-locking-and-nested-atom-locks-to-lock-validator.patch reiser4-use-generic-file-read.patch reiser4-simplify-reading-of-partially-converted-files.patch reiser4-use-page_offset.patch reiser4-use-reiser4_gfp_mask_get-in-reiser4-inode-allocation.patch reiser4-re-add-page_count-check-to-reiser4_releasepage.patch reiser4-restore-fibmap-ioctl-support-for-packed-files.patch reiser4-get-rid-of-semaphores-wherever-it-is-possible.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html