From: Sasha Levin <levinsasha928@gmail.com>
To: dan.magenheimer@oracle.com, konrad.wilk@oracle.com
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Sasha Levin <levinsasha928@gmail.com>
Subject: [PATCH v2 06/10] mm: frontswap: make all branches of if statement in put page consistent
Date: Fri, 8 Jun 2012 21:15:15 +0200 [thread overview]
Message-ID: <1339182919-11432-7-git-send-email-levinsasha928@gmail.com> (raw)
In-Reply-To: <1339182919-11432-1-git-send-email-levinsasha928@gmail.com>
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 <levinsasha928@gmail.com>
---
mm/frontswap.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/mm/frontswap.c b/mm/frontswap.c
index 1f1af0e..ee1763d 100644
--- a/mm/frontswap.c
+++ b/mm/frontswap.c
@@ -140,16 +140,16 @@ int __frontswap_store(struct page *page)
inc_frontswap_succ_stores();
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);
- inc_frontswap_failed_stores();
- } else
inc_frontswap_failed_stores();
+ 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, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-06-08 19:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-08 19:15 [PATCH v2 00/10] minor frontswap cleanups and tracing support Sasha Levin
2012-06-08 19:15 ` [PATCH v2 01/10] mm: frontswap: remove casting from function calls through ops structure Sasha Levin
2012-06-08 19:15 ` [PATCH v2 02/10] mm: frontswap: trivial coding convention issues Sasha Levin
2012-06-08 20:16 ` Pekka Enberg
2012-06-08 20:36 ` Sasha Levin
2012-06-08 19:15 ` [PATCH v2 03/10] mm: frontswap: split out __frontswap_curr_pages Sasha Levin
2012-06-08 19:15 ` [PATCH v2 04/10] mm: frontswap: split out __frontswap_unuse_pages Sasha Levin
2012-06-08 19:15 ` [PATCH v2 05/10] mm: frontswap: split frontswap_shrink further to simplify locking Sasha Levin
2012-06-08 19:15 ` Sasha Levin [this message]
2012-06-08 19:15 ` [PATCH v2 07/10] mm: frontswap: remove unnecessary check during initialization Sasha Levin
2012-06-08 19:15 ` [PATCH v2 08/10] mm: frontswap: add tracing support Sasha Levin
2012-06-08 19:15 ` [PATCH v2 09/10] mm: frontswap: split out function to clear a page out Sasha Levin
2012-06-08 19:15 ` [PATCH v2 10/10] mm: frontswap: remove unneeded headers Sasha Levin
2012-06-08 22:04 ` [PATCH v2 00/10] minor frontswap cleanups and tracing support Konrad Rzeszutek Wilk
2012-06-08 22:38 ` Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339182919-11432-7-git-send-email-levinsasha928@gmail.com \
--to=levinsasha928@gmail.com \
--cc=dan.magenheimer@oracle.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).