diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2025-11-24 15:07:34 -0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2025-11-24 15:07:34 -0800 |
| commit | 87fcafc4e2b47da41300a0db558afc74d2e418b7 (patch) | |
| tree | e4e8918cad2944759fc48ab3c900d560c93c8e28 /mm/swapfile.c | |
| parent | c7ba92bcfea34f6b4afc744c3b65c8f7420fefe0 (diff) | |
| parent | 7c9580f44f90f7a4c11fc7831efe323ebe446091 (diff) | |
Merge branch 'mm-hotfixes-stable' into mm-stable in order to merge
"mm/huge_memory: only get folio_order() once during __folio_split()" into
mm-stable.
Diffstat (limited to 'mm/swapfile.c')
| -rw-r--r-- | mm/swapfile.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index c35bb8593f50..04435f7ae7bf 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -2023,10 +2023,8 @@ swp_entry_t get_swap_page_of_type(int type) local_lock(&percpu_swap_cluster.lock); offset = cluster_alloc_swap_entry(si, 0, 1); local_unlock(&percpu_swap_cluster.lock); - if (offset) { + if (offset) entry = swp_entry(si->type, offset); - atomic_long_dec(&nr_swap_pages); - } } put_swap_device(si); } |