diff options
author | Sasha Levin <levinsasha928@gmail.com> | 2012-06-10 06:51:04 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-06-11 15:31:55 -0400 |
commit | d9674dda1c7ed49d503d3d7308c90a9f965f0783 (patch) | |
tree | a3ee1d15aa1846668baf3bfbba87a25695ce0ca8 /mm | |
parent | 69217b4cd044671b6dddcd9d33c8e4fdfd295ae3 (diff) |
mm: frontswap: make all branches of if statement in put page consistent
Currently it has a complex structure where different things are compared
at each branch. Simplify that and make both branches look similar.
Reviewed-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/frontswap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/frontswap.c b/mm/frontswap.c index e6353d9151ee..d8dc9867b005 100644 --- a/mm/frontswap.c +++ b/mm/frontswap.c | |||
@@ -140,16 +140,16 @@ int __frontswap_store(struct page *page) | |||
140 | inc_frontswap_succ_stores(); | 140 | inc_frontswap_succ_stores(); |
141 | if (!dup) | 141 | if (!dup) |
142 | atomic_inc(&sis->frontswap_pages); | 142 | atomic_inc(&sis->frontswap_pages); |
143 | } else if (dup) { | 143 | } else { |
144 | /* | 144 | /* |
145 | failed dup always results in automatic invalidate of | 145 | failed dup always results in automatic invalidate of |
146 | the (older) page from frontswap | 146 | the (older) page from frontswap |
147 | */ | 147 | */ |
148 | frontswap_clear(sis, offset); | ||
149 | atomic_dec(&sis->frontswap_pages); | ||
150 | inc_frontswap_failed_stores(); | ||
151 | } else { | ||
152 | inc_frontswap_failed_stores(); | 148 | inc_frontswap_failed_stores(); |
149 | if (dup) { | ||
150 | frontswap_clear(sis, offset); | ||
151 | atomic_dec(&sis->frontswap_pages); | ||
152 | } | ||
153 | } | 153 | } |
154 | if (frontswap_writethrough_enabled) | 154 | if (frontswap_writethrough_enabled) |
155 | /* report failure so swap also writes to swap device */ | 155 | /* report failure so swap also writes to swap device */ |