From patchwork Wed Feb 5 09:27:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baoquan He X-Patchwork-Id: 13960703 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 84AF1C02192 for ; Wed, 5 Feb 2025 09:28:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 142C36B0095; Wed, 5 Feb 2025 04:28:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F3516B0096; Wed, 5 Feb 2025 04:28:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EFC286B0098; Wed, 5 Feb 2025 04:28:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id CD8FB6B0095 for ; Wed, 5 Feb 2025 04:28:18 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8050C140790 for ; Wed, 5 Feb 2025 09:28:18 +0000 (UTC) X-FDA: 83085365076.02.C280945 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf27.hostedemail.com (Postfix) with ESMTP id AC1F240004 for ; Wed, 5 Feb 2025 09:28:16 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Q7upYimR; spf=pass (imf27.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.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=1738747696; 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=/m9fIb5RUGdXyEtpozVsgbTSVCO5CREUbIcsYzkG8Js=; b=mKCWXWvyyuQkgRtKlfmtGQuTKmoh7fWzltaeeNvbkwrktagiz7EN25/7KMpXDZEXvhuuJh pbXfCfuQMokVIt7X92/POcb14P97ft5MKkqBo+fxNTgvv4kA+OodPTEPmIjsy7qdXmNUt/ +OeBrREvCtqjoClC3oyrQHnmAC2VRNY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738747696; a=rsa-sha256; cv=none; b=ZXjEBpFHMj1/awxWod1fi5hJ1dXnS39PuQkkEr4oGcSw4n8ag6xuMJEBfpzm+mH8vX7US5 yqZ46kZFHUPic5zNoBYONUrP05QFe0DQK9Tt/sri4huhIUHCoLfrKeHCgUWqabkIEkpJG1 iwM3SbjvK9478jSNWqfN7eCKNGAu9w0= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Q7upYimR; spf=pass (imf27.hostedemail.com: domain of bhe@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=bhe@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738747696; 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=/m9fIb5RUGdXyEtpozVsgbTSVCO5CREUbIcsYzkG8Js=; b=Q7upYimRaJXrk4umcuYkE8OKvdtXKglb/O3CE2P7k+VcuOtzLXySFdMHkcyZv9PHL26RMB +DABxZnT5HE9XGckrsnpr+wcDbew7Cf1aP0xHk/wK50VnKOcvwt89d/gL21LaJSkGT/XeJ wIumNa4el6b44VmX6iyuDOeHPSheakQ= 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-461-ipAmL9EeOJ-YRtbTyRkJew-1; Wed, 05 Feb 2025 04:28:12 -0500 X-MC-Unique: ipAmL9EeOJ-YRtbTyRkJew-1 X-Mimecast-MFC-AGG-ID: ipAmL9EeOJ-YRtbTyRkJew 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 B3CBF1800871; Wed, 5 Feb 2025 09:28:11 +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 000243000197; Wed, 5 Feb 2025 09:28:07 +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 09/12] mm/swapfile.c: remove the unneeded checking Date: Wed, 5 Feb 2025 17:27:18 +0800 Message-ID: <20250205092721.9395-10-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-Stat-Signature: ncxxokyjto94175xirhptfepgkbundfq X-Rspamd-Queue-Id: AC1F240004 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1738747696-899432 X-HE-Meta: U2FsdGVkX1+iUGeMiRW7gZRiZ3k+sx6px8S5bhX5pUMi+ZBfbZnyBAmbd846XjFPcqqrYn7QOW4t2Y0dVmtfBNyT6fvQRPpQR6XbNNj+aaiTbd+lYnYaXmoiCk90vPOYS82AMvFtI9qmkbr/rEByFgVj63tTQAl6URH9EMLqwsZm5SfzQwbelnpw5Tbsc2uqRXQqOOheNaKZcaKg43DHT8gy4YOTDTA0RC7W/hs1mqbNy+sVAkFReuxEJqwnoCyOISKHVYhZooArYNPEGhvopBuPlSzhNzSi/nFEUMX6U14fFjcIgDhENowgobWLCAqDOAwG6oW+VEcoE9dROyjyzMQQ3J9t7CKUeTrq9jNi68h5tRpaQ1ucePesrxFvri0wkeBahEyShOpmvzji17zZC5p9O2FALslAGwhF7hcEoduNL0+S0M39bpS4za4kHvIy4zmm9cGV2Ugh4y7JRtE+rtd5xHI54/k466sGbQBevUr1+g4VpILlHUeszZ151PNbB3225NdiMt3Uc4IxwUOIOGipN1mKzKHH94UH2psMgnyT6FXfQuF0XCJ8GykTu+eRroaC7i7ibcKRktT+mMnS9V0iD1dDUen5eIRoiV6HINYzTcOFNfOtUw3w3G07vFZutG0lHYSSVknLJ98tTIA7ZnTK8RNG5/4z//kK7OaMXp7S5YVzkdlE9SWy1vguCidS8HAcK08HQIRYFOydJLWoBoULLt2shNPO4YJqOUWoqogL7oAiCCHLDz/J7OhQ8IQWdA99zJMOMjOtNKtW8D6R8mHl+bExYTFZLL9/kHHC4BofyDHEwc247uvpzFxikHJLnkgDr8F5linuKYRANkG1i9cIH5d1vS3KS+Josr8fg2VVVM7EVL5Mz/TBgsLIwKietHsZGfXHUdCVve3aHZPUJKBUyK2JGi9w/evNifOHpf9P9/YiOli1XE3bvvE6O4qB0sEh5T2UFiq6ZWYNshX L3uLl45G S4Dhe9HJtayJT+hVeFshOubcfwjVqCj2TjmBbVKP6AOR1An9X04rHhImg4dmdj5PL7Qm09E+6ZCN//kk6/uYqjjunm1Mul8UFrDeGSFukNuimWpAuRnVI/LEHjiOq08C+h1HjU8sZ3ZyGFe0av+xsUcbDlNBnDXPE9kcjPE5SyN8WFCvf44GPaRM1buhHdcEmBUq5k/7+Lx+nf8lyjd8wQPxINpVGQqhPLY6xvqld975QlaNg0YtryXSiN6p7rLM9Ym3EjDbxqLNZbY6Od24NDS5Xo6D83/P2f3CguSatAhWMkLKc6UD54jOnKCObirqki9KNIh9yxIJ2sYkeJgCK+vaghQ== 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: In free_swap_and_cache_nr(), invocation of get_swap_device() has done the checking if it's a swap entry. So remove the redundant checking here. Signed-off-by: Baoquan He --- mm/swapfile.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index 78b7329ad2c7..2a25ff5f31c8 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1784,9 +1784,6 @@ void free_swap_and_cache_nr(swp_entry_t entry, int nr) bool any_only_cache = false; unsigned long offset; - if (non_swap_entry(entry)) - return; - si = get_swap_device(entry); if (!si) return;