[03/12] mm/swap: remove SWAP_FLAG_PRIO_SHIFT

Message ID	20250205092721.9395-4-bhe@redhat.com (mailing list archive)
State	New
Headers	show Return-Path: <owner-linux-mm@kvack.org> 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 Message-ID: <20250205092721.9395-4-bhe@redhat.com> In-Reply-To: <20250205092721.9395-1-bhe@redhat.com> References: <20250205092721.9395-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	Tiny cleanup and improvements about SWAP code \| expand [00/12] Tiny cleanup and improvements about SWAP code [01/12] mm/swap_state.c: fix the obsolete code comment [02/12] mm/swap_state.c: optimize the code in clear_shadow_from_swap_cache() [03/12] mm/swap: remove SWAP_FLAG_PRIO_SHIFT [04/12] mm/swap: skip scanning cluster range if it's empty cluster [05/12] mm/swap: rename swap_is_has_cache() to swap_only_has_cache() [06/12] mm/swapfile.c: update the code comment above swap_count_continued() [07/12] mm/swapfile.c: optimize code in setup_clusters() [08/12] mm/swap_state.c: remove the meaningless code comment [09/12] mm/swapfile.c: remove the unneeded checking [10/12] mm/swap: rename swap_swapcount() to swap_entry_swapped() [11/12] mm/swapfile.c: remove the incorrect code comment [12/12] mm/swapfile.c: open code cluster_alloc_swap()

Message ID

20250205092721.9395-4-bhe@redhat.com (mailing list archive)

State

New

Headers

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
Message-ID: <20250205092721.9395-4-bhe@redhat.com>
In-Reply-To: <20250205092721.9395-1-bhe@redhat.com>
References: <20250205092721.9395-1-bhe@redhat.com>
MIME-Version: 1.0
Content-type: text/plain
Content-Transfer-Encoding: 8bit
Sender: owner-linux-mm@kvack.org
Precedence: bulk

Series

Tiny cleanup and improvements about SWAP code | expand

Commit Message

Baoquan He Feb. 5, 2025, 9:27 a.m. UTC

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",

[03/12] mm/swap: remove SWAP_FLAG_PRIO_SHIFT

Commit Message

Patch