From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756410AbZHNGUZ (ORCPT ); Fri, 14 Aug 2009 02:20:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756386AbZHNGUY (ORCPT ); Fri, 14 Aug 2009 02:20:24 -0400 Received: from TYO202.gate.nec.co.jp ([202.32.8.206]:41336 "EHLO tyo202.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756381AbZHNGUY (ORCPT ); Fri, 14 Aug 2009 02:20:24 -0400 Date: Fri, 14 Aug 2009 15:16:30 +0900 From: Daisuke Nishimura To: Andrew Morton Cc: Balbir Singh , Hugh Dickins , KAMEZAWA Hiroyuki , Johannes Weiner , Daisuke Nishimura , LKML , linux-mm Subject: Re: [cleanup][2/2] mm: add_to_swap_cache() does not return -EEXIST Message-Id: <20090814151630.950e5cd9.nishimura@mxp.nes.nec.co.jp> In-Reply-To: <20090810112716.fb110c5a.nishimura@mxp.nes.nec.co.jp> References: <20090810112326.3526b11d.nishimura@mxp.nes.nec.co.jp> <20090810112716.fb110c5a.nishimura@mxp.nes.nec.co.jp> Organization: NEC Soft, Ltd. X-Mailer: Sylpheed 2.6.0 (GTK+ 2.10.14; i686-pc-mingw32) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Andrew, this is a minor fix for mm-add_to_swap_cache-does-not-return-eexist.patch. It didn't catch up with the change in [1/2](mm-add_to_swap_cache-must-not-sleep.patch). === From: Daisuke Nishimura fix indent size. Signed-off-by: Daisuke Nishimura --- mm/swap_state.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/swap_state.c b/mm/swap_state.c index ff5bd8c..6d1daeb 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -92,12 +92,12 @@ static int __add_to_swap_cache(struct page *page, swp_entry_t entry) spin_unlock_irq(&swapper_space.tree_lock); if (unlikely(error)) { - /* - * Only the context which have set SWAP_HAS_CACHE flag - * would call add_to_swap_cache(). - * So add_to_swap_cache() doesn't returns -EEXIST. - */ - VM_BUG_ON(error == -EEXIST); + /* + * Only the context which have set SWAP_HAS_CACHE flag + * would call add_to_swap_cache(). + * So add_to_swap_cache() doesn't returns -EEXIST. + */ + VM_BUG_ON(error == -EEXIST); set_page_private(page, 0UL); ClearPageSwapCache(page); page_cache_release(page);