summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiaohe Lin <linmiaohe@huawei.com>2020-12-14 19:05:58 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-12-15 12:13:39 -0800
commitd8aa24e04fb2a74dac0f7709da36950da5502be1 (patch)
tree28687f7cee3ec27a8d74306d2c4e02341748c03f
parent43fbdeb349640e3d763f0eb52b6aef92d4e2ec17 (diff)
downloadlinux-d8aa24e04fb2a74dac0f7709da36950da5502be1.tar.gz
linux-d8aa24e04fb2a74dac0f7709da36950da5502be1.tar.bz2
linux-d8aa24e04fb2a74dac0f7709da36950da5502be1.zip
mm/swapfile.c: use helper function swap_count() in add_swap_count_continuation()
Commit 570a335b8e22 ("swap_info: swap count continuations") introduced the func add_swap_count_continuation() but forgot to use the helper function swap_count() introduced by commit 355cfa73ddff ("mm: modify swap_map and add SWAP_HAS_CACHE flag"). Link: https://lkml.kernel.org/r/20201009134306.18033-1-linmiaohe@huawei.com Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/swapfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c
index d58361109066..4a6ff685a736 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -3613,7 +3613,7 @@ int add_swap_count_continuation(swp_entry_t entry, gfp_t gfp_mask)
ci = lock_cluster(si, offset);
- count = si->swap_map[offset] & ~SWAP_HAS_CACHE;
+ count = swap_count(si->swap_map[offset]);
if ((count & ~COUNT_CONTINUED) != SWAP_MAP_MAX) {
/*