From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753541Ab1ABPpW (ORCPT ); Sun, 2 Jan 2011 10:45:22 -0500 Received: from mail-pv0-f174.google.com ([74.125.83.174]:39370 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752645Ab1ABPpL (ORCPT ); Sun, 2 Jan 2011 10:45:11 -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=lArd2UoUkvKiSYJvG9qsBjKwjDhmMrZY+zG8bNCwOSNBwM/eYoXrZkwGTuJw+BdRar IDHFe/h5NYLgF8/JNvGk9qM8n0ZaBRM7oQEjHebkFA+USUmsbWEOOepd53V95e+oBmHS oaMlyaIFdvJJQ3hOMgxo9UCvLn6qXaoNVlVeQ= From: Minchan Kim To: Andrew Morton Cc: linux-mm , LKML , KAMEZAWA Hiroyuki , Hugh Dickins , Minchan Kim , Christoph Hellwig Subject: [PATCH v2 6/7] Good bye remove_from_page_cache Date: Mon, 3 Jan 2011 00:44:35 +0900 Message-Id: <3733d2c036b930eba792e12c824516c04988556e.1293982522.git.minchan.kim@gmail.com> 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 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 1ca7475..a4c43f7 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,22 +173,7 @@ 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