From: Baoquan He <bhe@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com,
chrisl@kernel.org, Baoquan He <bhe@redhat.com>
Subject: [PATCH 03/12] mm/swap: remove SWAP_FLAG_PRIO_SHIFT
Date: Wed, 5 Feb 2025 17:27:12 +0800 [thread overview]
Message-ID: <20250205092721.9395-4-bhe@redhat.com> (raw)
In-Reply-To: <20250205092721.9395-1-bhe@redhat.com>
It doesn't make sense to have a zero value of shift. Remove it to
avoid confusion.
Signed-off-by: Baoquan He <bhe@redhat.com>
---
include/linux/swap.h | 1 -
mm/swapfile.c | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/include/linux/swap.h b/include/linux/swap.h
index b13b72645db3..20bfedc8c4f2 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -24,7 +24,6 @@ struct pagevec;
#define SWAP_FLAG_PREFER 0x8000 /* set if swap priority specified */
#define SWAP_FLAG_PRIO_MASK 0x7fff
-#define SWAP_FLAG_PRIO_SHIFT 0
#define SWAP_FLAG_DISCARD 0x10000 /* enable discard for swap */
#define SWAP_FLAG_DISCARD_ONCE 0x20000 /* discard swap area at swapon-time */
#define SWAP_FLAG_DISCARD_PAGES 0x40000 /* discard page-clusters after use */
diff --git a/mm/swapfile.c b/mm/swapfile.c
index ba19430dd4ea..9c9a4ec6d4c6 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -3449,8 +3449,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
mutex_lock(&swapon_mutex);
prio = -1;
if (swap_flags & SWAP_FLAG_PREFER)
- prio =
- (swap_flags & SWAP_FLAG_PRIO_MASK) >> SWAP_FLAG_PRIO_SHIFT;
+ prio = swap_flags & SWAP_FLAG_PRIO_MASK;
enable_swap_info(si, prio, swap_map, cluster_info, zeromap);
pr_info("Adding %uk swap on %s. Priority:%d extents:%d across:%lluk %s%s%s%s\n",
--
2.41.0
next prev parent reply other threads:[~2025-02-05 9:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-05 9:27 [PATCH 00/12] Tiny cleanup and improvements about SWAP code Baoquan He
2025-02-05 9:27 ` [PATCH 01/12] mm/swap_state.c: fix the obsolete code comment Baoquan He
2025-02-05 9:27 ` [PATCH 02/12] mm/swap_state.c: optimize the code in clear_shadow_from_swap_cache() Baoquan He
2025-02-05 9:27 ` Baoquan He [this message]
2025-02-05 9:27 ` [PATCH 04/12] mm/swap: skip scanning cluster range if it's empty cluster Baoquan He
2025-02-05 17:07 ` Kairui Song
2025-02-06 1:40 ` Baoquan He
2025-02-06 2:14 ` Kairui Song
2025-02-05 9:27 ` [PATCH 05/12] mm/swap: rename swap_is_has_cache() to swap_only_has_cache() Baoquan He
2025-02-05 9:27 ` [PATCH 06/12] mm/swapfile.c: update the code comment above swap_count_continued() Baoquan He
2025-02-06 7:50 ` Kairui Song
2025-02-07 2:46 ` Baoquan He
2025-02-07 2:50 ` [PATCH v2 " Baoquan He
2025-02-05 9:27 ` [PATCH 07/12] mm/swapfile.c: optimize code in setup_clusters() Baoquan He
2025-02-05 9:27 ` [PATCH 08/12] mm/swap_state.c: remove the meaningless code comment Baoquan He
2025-02-05 9:27 ` [PATCH 09/12] mm/swapfile.c: remove the unneeded checking Baoquan He
2025-02-05 9:27 ` [PATCH 10/12] mm/swap: rename swap_swapcount() to swap_entry_swapped() Baoquan He
2025-02-05 9:27 ` [PATCH 11/12] mm/swapfile.c: remove the incorrect code comment Baoquan He
2025-02-05 9:27 ` [PATCH 12/12] mm/swapfile.c: open code cluster_alloc_swap() Baoquan He
2025-02-07 9:36 ` [PATCH 00/12] Tiny cleanup and improvements about SWAP code Kairui Song
2025-02-08 1:08 ` Baoquan He
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=20250205092721.9395-4-bhe@redhat.com \
--to=bhe@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=chrisl@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=ryncsn@gmail.com \
/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