From patchwork Wed Feb 5 09:27:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13960697 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B07B9C02194 for ; Wed, 5 Feb 2025 09:27:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 475F928000A; Wed, 5 Feb 2025 04:27:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 40003280006; Wed, 5 Feb 2025 04:27:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C6E628000A; Wed, 5 Feb 2025 04:27:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0B3FB280006 for ; Wed, 5 Feb 2025 04:27:53 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7CA2B120831 for ; Wed, 5 Feb 2025 09:27:52 +0000 (UTC) X-FDA: 83085363984.30.ACB3D8B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf01.hostedemail.com (Postfix) with ESMTP id B39204000D for ; Wed, 5 Feb 2025 09:27:50 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="JI/uPGbW"; spf=pass (imf01.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738747670; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=FIOS+/tyiatrDoGbeFH0VR1TEwzBCwvdDVquOSZT3r0=; b=OSch74ocheZPojFLMLMHGidgc4zTjKPWv1R06m+w8ZqMGPCzc690YT9CMFpRpz4tQxukCY hFNnaBI1Yn08auvuiBmsNGrWEon0uyyB5pKMw/TzW5RP4Jc8KE6DSeGaPW+AkqUj5kj4yr xN+tBF6NeT7lWwTcysf3mNlXd711CRA= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="JI/uPGbW"; spf=pass (imf01.hostedemail.com: domain of bhe@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738747670; a=rsa-sha256; cv=none; b=Iy/xovCWlu+Mb//rIvgF+6ehk41Viy+5PojDJnnf+XDRcoKB15KRxq5/XO/ctAxJmmGy3e PEoPBFEJXhDvcF8oqZB/3xUKWwomSVT3okS0/I+QYn9joqsGGiCBdi5+E/OdRC2HrfkfJV FR5YQFT+PJwzJ9ewNA1ztAaZRslfZvs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738747670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FIOS+/tyiatrDoGbeFH0VR1TEwzBCwvdDVquOSZT3r0=; b=JI/uPGbW+XhvGbfHih7KsOfiAFf2YVKolfDbG6I36uCZxHUgEqYL+k2zUcsth/gmcAuDDQ IfA2QD+znH8bVn970aLmQ3keqcO0UpNDPhH1xjrtcRpPxf1TxL8e3/5yujMiBcwDAIbn2I azRhNfwT40MZmPkwXuGjyS9OekFsQnA= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-626-BmsBWnX8OmGC-bxlcS6guQ-1; Wed, 05 Feb 2025 04:27:46 -0500 X-MC-Unique: BmsBWnX8OmGC-bxlcS6guQ-1 X-Mimecast-MFC-AGG-ID: BmsBWnX8OmGC-bxlcS6guQ Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A05631801A3D; Wed, 5 Feb 2025 09:27:43 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.72.112.190]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C4E203000199; Wed, 5 Feb 2025 09:27:39 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, ryncsn@gmail.com, chrisl@kernel.org, Baoquan He 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 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: B39204000D X-Stat-Signature: gsu3eqtx8f3bz5fmd3fsqhe6q3hq5s54 X-Rspam-User: X-HE-Tag: 1738747670-543447 X-HE-Meta: U2FsdGVkX1+h6x2zVD8B8DpjnkGFN0YWvJ3U5eSZNRkENaUcOj0KA/LKdMpRJK4bCPdhPNIrnS/dLqgOqR6tuqUUYbFzTCWVUP2WtsaT/Q22BTB5gKUHF7r1CIkFTb64ui5wmj7N5oKqb+vIi8Bt3IUu+NFWeykV0s1KbPgO8AcmdDcrUHF0WG+zx7r5AD5xJH9KvEGT9lfnhNUrYsfhuYE0OWwirJEofrmL+GwBXHHMkzAUd4u3b1HzlSYJ5x6MX5s5dXlefaqInZUlW6KE82d/0P5sRDQeNmhdSt5Nc50tUD0XR49xQEbDZ3nOjQ1u5fo9/1zYUqw+RBuIIqfbWARpzBFaPLBhanGGhwdt6G4DzHeKtwGhYJxxoKIczQ2YKQwDKw96FX04LbxVFwFCqWsSvEFeLIW7B3i8M27ScZGHawX0a5cnka4XuW46omMi1XCmRXr5evx3tF0qoUcsQh8DD6eP7No3V47PLLafTT8pizaOA3RA6/F6wDLj/Wo26Snhs8AQd8buWjhxmZcW6kXJihNcX3Ph/XNtrmciDcLs5V9zrmZsd13xMA6KNJ89BvGeSKddIYepRJRs7HeVvFmkpJdR+q5JeG7lii5Li/cpZODc0sm3kQNRUsJMMBLlAeRxuaBiuRHVbMpL/pYS9/x07Z8jpNomdzGVedFA7HVzGkcPeo2PnLZsc1DW1eU2j/qajKVPfhq9lTQXFqgLxoLXQOcGsUPhH7Kxg/y2wTs3a+p4aYddLloen5/f4vz6YWxOVlG2LCBmm8wy/8Np7MNBcr2RsAHFerS8nCQ2slLCPZc7XN3loctqijFzKlxue66OCPnx8C3WoIDtHR56pGYphM3jk6tw+I/NtdLzYHZ6YiohpZgvPMCwDN/0GpEW/gJ3qGaz18Hd4PQWPKHqBplRzhIYt8Iwag7ravER0tZD/Oo+t3xp1s/KCvIh9AKZn2TCjs7nbqIvvpweyID pcVD/u9F gIoHllucOMACoHoYdUNXnMYk29VC3yEq+MZKpxAbXJMM1FOb7t+qVoCxmmSrCaotNFY8QwV5R6aP1VlugvrCyRa3Vj65/0HW7HwVU92VXEpQ1B4VHL8XzR9WQVhrfRjGmHyClYRYeA7Is8iDku56A5MNM6Qq1NT3M8is3vn7l14YgMbsQRgGzwUgzTuxaWWCvChXmVKum2d+Y51R8Rs6c3qzoeYUZSZw1X1sMMUpwPLW03JzlsGwI9vmhymgVCTTX56jMhboHiYyHGRsVJhf+uoJalSWtzFId3AwxEjGTHO0E8uKiTCP67wODS7WHrvcseFp7/uiQMDf4YzMugb6MiJKeI1a+3UtamsXDKIs7bLvDaM2Usca1X82aMQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: It doesn't make sense to have a zero value of shift. Remove it to avoid confusion. Signed-off-by: Baoquan He --- 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",