Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756051Ab2FFK4f (ORCPT ); Wed, 6 Jun 2012 06:56:35 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]:45499 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754305Ab2FFKya (ORCPT ); Wed, 6 Jun 2012 06:54:30 -0400 From: Sasha Levin To: konrad.wilk@oracle.com, dan.magenheimer@oracle.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sasha Levin Subject: [PATCH 06/11] mm: frontswap: make all branches of if statement in put page consistent Date: Wed, 6 Jun 2012 12:55:10 +0200 Message-Id: <1338980115-2394-6-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1338980115-2394-1-git-send-email-levinsasha928@gmail.com> References: <1338980115-2394-1-git-send-email-levinsasha928@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1272 Lines: 42 Currently it has a complex structure where different things are compared at each branch. Simplify that and make both branches look similar. Signed-off-by: Sasha Levin --- mm/frontswap.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/frontswap.c b/mm/frontswap.c index 618ef91..f2f4685 100644 --- a/mm/frontswap.c +++ b/mm/frontswap.c @@ -119,16 +119,16 @@ int __frontswap_put_page(struct page *page) frontswap_succ_puts++; if (!dup) atomic_inc(&sis->frontswap_pages); - } else if (dup) { + } else { /* failed dup always results in automatic invalidate of the (older) page from frontswap */ - frontswap_clear(sis, offset); - atomic_dec(&sis->frontswap_pages); - frontswap_failed_puts++; - } else { frontswap_failed_puts++; + if (dup) { + frontswap_clear(sis, offset); + atomic_dec(&sis->frontswap_pages); + } } if (frontswap_writethrough_enabled) /* report failure so swap also writes to swap device */ -- 1.7.8.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/