From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753251Ab1ABPpS (ORCPT ); Sun, 2 Jan 2011 10:45:18 -0500 Received: from mail-pz0-f46.google.com ([209.85.210.46]:62307 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752624Ab1ABPpE (ORCPT ); Sun, 2 Jan 2011 10:45:04 -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=f0PCri99k8vIAb+WMM8Nz82P96vNsZeHzpb56um1X/fo/EBZ1+YlZY1Lr7Ir/gL59o yplfK7PxWwTcgr8+JAmCMfKhTBOWns1ieMkxx5IoVzvtICJKwNxWC5/vD2pH5V/ux41G SK1NAZ+/NwW8GZps3ecim2s08EITQEvBDfF4E= From: Minchan Kim To: Andrew Morton Cc: linux-mm , LKML , KAMEZAWA Hiroyuki , Hugh Dickins , Minchan Kim Subject: [PATCH v2 4/7] swap: Change remove_from_page_cache Date: Mon, 3 Jan 2011 00:44:33 +0900 Message-Id: <74a0a108b98f304efc2e28cea413fa3c9682ca15.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 This patch series changes remove_from_page_cache's page ref counting rule. Page cache ref count is decreased in delete_from_page_cache. So we don't need decreasing page reference by caller. Acked-by:Hugh Dickins Reviewed-by: KAMEZAWA Hiroyuki Signed-off-by: Minchan Kim --- mm/shmem.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index fa9acc9..079cced 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1081,7 +1081,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) shmem_recalc_inode(inode); if (swap.val && add_to_swap_cache(page, swap, GFP_ATOMIC) == 0) { - remove_from_page_cache(page); + delete_from_page_cache(page); shmem_swp_set(info, entry, swap.val); shmem_swp_unmap(entry); if (list_empty(&info->swaplist)) @@ -1091,7 +1091,6 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) spin_unlock(&info->lock); swap_shmem_alloc(swap); BUG_ON(page_mapped(page)); - page_cache_release(page); /* pagecache ref */ swap_writepage(page, wbc); if (inode) { mutex_lock(&shmem_swaplist_mutex); -- 1.7.0.4