From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752168Ab1AHWQr (ORCPT ); Sat, 8 Jan 2011 17:16:47 -0500 Received: from zene.cmpxchg.org ([85.214.230.12]:55066 "EHLO zene.cmpxchg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751872Ab1AHWQr (ORCPT ); Sat, 8 Jan 2011 17:16:47 -0500 Date: Sat, 8 Jan 2011 23:16:35 +0100 From: Johannes Weiner To: Minchan Kim Cc: Andrew Morton , linux-mm , LKML , KAMEZAWA Hiroyuki , Hugh Dickins , Christoph Hellwig Subject: Re: [PATCH v2 1/7] Introduce delete_from_page_cache Message-ID: <20110108221635.GB23189@cmpxchg.org> References: <39f5e90f69d523d7f69f8ba283e318def6538307.1293982522.git.minchan.kim@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <39f5e90f69d523d7f69f8ba283e318def6538307.1293982522.git.minchan.kim@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 03, 2011 at 12:44:30AM +0900, Minchan Kim wrote: > This function works as just wrapper remove_from_page_cache. > The difference is that it decreases page references in itself. > So caller have to make sure it has a page reference before calling. > > This patch is ready for removing remove_from_page_cache. > > Cc: Christoph Hellwig > Acked-by: Hugh Dickins > Reviewed-by: KAMEZAWA Hiroyuki > Signed-off-by: Minchan Kim > --- > include/linux/pagemap.h | 1 + > mm/filemap.c | 17 +++++++++++++++++ > 2 files changed, 18 insertions(+), 0 deletions(-) > > diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h > index 9c66e99..7a1cb49 100644 > --- a/include/linux/pagemap.h > +++ b/include/linux/pagemap.h > @@ -457,6 +457,7 @@ 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); > > /* > * Like add_to_page_cache_locked, but used to add newly allocated pages: > diff --git a/mm/filemap.c b/mm/filemap.c > index 095c393..1ca7475 100644 > --- a/mm/filemap.c > +++ b/mm/filemap.c > @@ -166,6 +166,23 @@ void remove_from_page_cache(struct page *page) > } > EXPORT_SYMBOL(remove_from_page_cache); > > +/** > + * delete_from_page_cache - delete page from page cache > + * This empty line is invalid kerneldoc, the argument descriptions must follow the short function description line immediately. Otherwise, Reviewed-by: Johannes Weiner > + * @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); > + > static int sync_page(void *word) > { > struct address_space *mapping;