From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752735Ab1AKFX4 (ORCPT ); Tue, 11 Jan 2011 00:23:56 -0500 Received: from mail-yw0-f46.google.com ([209.85.213.46]:55762 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752673Ab1AKFXB (ORCPT ); Tue, 11 Jan 2011 00:23:01 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=gQcrUlL4wUtx6l4KOatUpLpnv9SXzec+JPU5j30uSTRDV6Ny8y8JgMP7MMhWng9bXN Qlim6DeB2Pmq680GuHZRE7lJVyQgy1ouHNMApxALln75feoQZiXtYrezz08dNSQ3ELrv fWWkCjiOpegppoM1tA1t60lBZzvejfZSm6iRo= From: Minchan Kim To: Andrew Morton Cc: linux-mm , LKML , KAMEZAWA Hiroyuki , Hugh Dickins , Mel Gorman , KOSAKI Motohiro , Johannes Weiner , Minchan Kim , Christoph Hellwig Subject: [PATCH v3 6/7] Good bye remove_from_page_cache Date: Tue, 11 Jan 2011 14:22:10 +0900 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now delete_from_page_cache replaces remove_from_page_cache. So we remove remove_from_page_cache so fs or something out of mainline will notice it when compile time and can fix it. Cc: Christoph Hellwig Acked-by: Hugh Dickins Acked-by: Mel Gorman Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Johannes Weiner Reviewed-by: KOSAKI Motohiro Signed-off-by: Minchan Kim --- include/linux/pagemap.h | 1 - mm/filemap.c | 27 +++++++++++---------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 7a1cb49..7bf6587 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -455,7 +455,6 @@ int add_to_page_cache_locked(struct page *page, struct address_space *mapping, pgoff_t index, gfp_t gfp_mask); int add_to_page_cache_lru(struct page *page, struct address_space *mapping, pgoff_t index, gfp_t gfp_mask); -extern void remove_from_page_cache(struct page *page); extern void __remove_from_page_cache(struct page *page); extern void delete_from_page_cache(struct page *page); diff --git a/mm/filemap.c b/mm/filemap.c index cf9bbf2..a5542fa 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -148,7 +148,17 @@ void __remove_from_page_cache(struct page *page) } } -void remove_from_page_cache(struct page *page) +/** + * delete_from_page_cache - delete page from page cache + * @page: the page which the kernel is trying to remove from page cache + * + * This must be called only on pages that have + * been verified to be in the page cache and locked. + * It will never put the page into the free list, + * the caller has a reference on the page. + */ +void delete_from_page_cache(struct page *page) + { struct address_space *mapping = page->mapping; void (*freepage)(struct page *); @@ -163,21 +173,6 @@ void remove_from_page_cache(struct page *page) if (freepage) freepage(page); -} -EXPORT_SYMBOL(remove_from_page_cache); - -/** - * delete_from_page_cache - delete page from page cache - * @page: the page which the kernel is trying to remove from page cache - * - * This must be called only on pages that have - * been verified to be in the page cache and locked. - * It will never put the page into the free list, - * the caller has a reference on the page. - */ -void delete_from_page_cache(struct page *page) -{ - remove_from_page_cache(page); page_cache_release(page); } EXPORT_SYMBOL(delete_from_page_cache); -- 1.7.0.4