From: Miaohe Lin <linmiaohe@huawei.com>
To: <akpm@linux-foundation.org>
Cc: <linux-kernel@vger.kernel.org>, <linux-mm@kvack.org>,
<linmiaohe@huawei.com>
Subject: [PATCH 1/5] mm/swapfile: move get_swap_page_of_type() under CONFIG_HIBERNATION
Date: Tue, 18 May 2021 21:53:48 +0800 [thread overview]
Message-ID: <20210518135352.3705306-2-linmiaohe@huawei.com> (raw)
In-Reply-To: <20210518135352.3705306-1-linmiaohe@huawei.com>
We should move get_swap_page_of_type() under CONFIG_HIBERNATION since the
only caller of this function is now suspend routine.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
mm/swapfile.c | 48 ++++++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 2aad85751991..4e7628b82e63 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1137,30 +1137,6 @@ int get_swap_pages(int n_goal, swp_entry_t swp_entries[], int entry_size)
return n_ret;
}
-/* The only caller of this function is now suspend routine */
-swp_entry_t get_swap_page_of_type(int type)
-{
- struct swap_info_struct *si = swap_type_to_swap_info(type);
- pgoff_t offset;
-
- if (!si)
- goto fail;
-
- spin_lock(&si->lock);
- if (si->flags & SWP_WRITEOK) {
- /* This is called for allocating swap entry, not cache */
- offset = scan_swap_map(si, 1);
- if (offset) {
- atomic_long_dec(&nr_swap_pages);
- spin_unlock(&si->lock);
- return swp_entry(type, offset);
- }
- }
- spin_unlock(&si->lock);
-fail:
- return (swp_entry_t) {0};
-}
-
static struct swap_info_struct *__swap_info_get(swp_entry_t entry)
{
struct swap_info_struct *p;
@@ -1812,6 +1788,30 @@ int free_swap_and_cache(swp_entry_t entry)
}
#ifdef CONFIG_HIBERNATION
+
+swp_entry_t get_swap_page_of_type(int type)
+{
+ struct swap_info_struct *si = swap_type_to_swap_info(type);
+ pgoff_t offset;
+
+ if (!si)
+ goto fail;
+
+ spin_lock(&si->lock);
+ if (si->flags & SWP_WRITEOK) {
+ /* This is called for allocating swap entry, not cache */
+ offset = scan_swap_map(si, 1);
+ if (offset) {
+ atomic_long_dec(&nr_swap_pages);
+ spin_unlock(&si->lock);
+ return swp_entry(type, offset);
+ }
+ }
+ spin_unlock(&si->lock);
+fail:
+ return (swp_entry_t) {0};
+}
+
/*
* Find the swap type that corresponds to given device (if any).
*
--
2.23.0
next prev parent reply other threads:[~2021-05-18 13:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 13:53 [PATCH 0/5] Cleanups for swap Miaohe Lin
2021-05-18 13:53 ` Miaohe Lin [this message]
2021-05-18 13:53 ` [PATCH 2/5] mm/swap: remove unused local variable nr_shadows Miaohe Lin
2021-05-18 14:37 ` Matthew Wilcox
2021-05-19 1:37 ` Miaohe Lin
2021-05-18 13:53 ` [PATCH 3/5] mm/swap_slots.c: delete meaningless forward declarations Miaohe Lin
2021-05-18 13:53 ` [PATCH 4/5] mm/swap: remove unused global variable nr_swapper_spaces Miaohe Lin
2021-05-18 13:53 ` [PATCH 5/5] mm/swap: simplify the code of find_get_incore_page() Miaohe Lin
2021-05-18 14:33 ` Matthew Wilcox
2021-05-18 21:13 ` Andrew Morton
2021-05-18 21:34 ` Matthew Wilcox
2021-05-19 1:39 ` Miaohe Lin
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=20210518135352.3705306-2-linmiaohe@huawei.com \
--to=linmiaohe@huawei.com \
--cc=akpm@linux-foundation.org \
--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).