From mboxrd@z Thu Jan 1 00:00:00 1970 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 98706EE6456 for ; Fri, 15 Sep 2023 10:17:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 246666B0083; Fri, 15 Sep 2023 06:17:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 08A108D0001; Fri, 15 Sep 2023 06:17:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB9326B0345; Fri, 15 Sep 2023 06:17:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id DF2486B0343 for ; Fri, 15 Sep 2023 06:17:51 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A3A121CAC68 for ; Fri, 15 Sep 2023 10:17:51 +0000 (UTC) X-FDA: 81238430742.09.C442ADF Received: from out-220.mta1.migadu.com (out-220.mta1.migadu.com [95.215.58.220]) by imf10.hostedemail.com (Postfix) with ESMTP id E584CC0002 for ; Fri, 15 Sep 2023 10:17:49 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=d+A5Samu; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf10.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.220 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694773070; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=W4OXJL+60MT/EpFD3EhGCH+RY9u8YTytGadp3nozILg=; b=A0RpZQljY286TTJbR4eh6gqw8GoBbtzZVbLAx3ZANFgodhGQVwF+0ZbY5uYVji+5L/1FWe aLWEoKhEyQSo7Clp3/0Qe9E+nWQp4IeZaAnkxGddoyxhS6DHHXhKOhFIFSGppT9/1GeW37 6nvXfUAzhzVxU0ng+9QpoHQaaZYbalU= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=d+A5Samu; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf10.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.220 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694773070; a=rsa-sha256; cv=none; b=AkYMijPl31vpF1ySHcIs40khGIdqm95TTcnpGfRIDHmUah+MIsxA6Mm/LgG4hMxFj4YkdI DcjIkigtsEHxtuA2VffAJiXd1zm0m/O41grkBPp/MZVCSM4iTm3xFjKe/mKbg2YLhpDyBL KqJVtOsn+AlmMgLRaeRCEU9/d5EnTRc= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1694773067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=W4OXJL+60MT/EpFD3EhGCH+RY9u8YTytGadp3nozILg=; b=d+A5SamuPrYPNNn5I5tuWu15eKBGHtzGvFPIOVyX5iIJHBTtNqpTcrJ4kHMGFctF3C1GHl /nJLrNcJGp9LFBxZV2o50jGkbr8XPT0xca3odbgRo54CViZ/Apqqnu/I8er1HP8kEwZ4VG QphZ2hyKu976OWwgN6KYRxN1dI4RYJw= From: Yajun Deng To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH] mm/rmap: convert __page_check_anon_rmap() to folio Date: Fri, 15 Sep 2023 18:17:31 +0800 Message-Id: <20230915101731.1725986-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: E584CC0002 X-Stat-Signature: yz73whdnk7mkhhjd5mgxam3w6jh6z3qb X-HE-Tag: 1694773069-11403 X-HE-Meta: U2FsdGVkX1/0sfXdzhK22Rkh+L6V9okqyrNZl7CnmQ8IntbkgnUTS4F1Ped+y9x58zOcqwYO6pecIZCw7xdYGGyy/gMy5pHyP+QprQ80b5vSINbd75av19AoH74wNKWKvjnbLYt0ElLOJMWXqf9J4XTqgx0DH+WkMUh5lY8HEIEcmDme3Qn2GZk3wsVaRwd9HPQIueqjjDKrzKL+nLogbmNB6of8FAEyYnIBp/kL6JjblztBeXBh1PGEi5XWiVpsbdT2mQW+xfBk9iQdd77W4Ldui4Y+tG/RKVNPK5jekfgNfLtyuEJL2GeEC4vnlL6h50jaQy0iPyFBT2E33trQvCkVrI35JrnUq7DzdQc+Oxv2cjKOfW2EgwaJYBrXCN5zaqtRC+8eDjAhycFB29XiEFbpQuIutHJDlnogNFZIMuiL7w6hGWkSS10QY4h0dYJen4sNzpAdR44BxMD5D+hnByaBSnNWGvyDEOwIOPmKPAj8WYTb3MNd5aFAvByD01HMmpJrDrmtSXvJjhQfHDw+nI9uLpsQPCb1Olcj3ShnZ8zjl/7eTiVuiKU93ziski/wmZu6pTbrvChOGL/jv8w1zOrI561o53mX+D+x3m00P0n2jO01Yj1Gpc7jybi56jMzl+Vwux5L9zqz1uwW2Jh1tCVqQpDPHVKAVdipJIYVhl12JZ1BDJSC8eCPkGw3WRn9zf9psVEiKw1urCJq8ePn3OINmK17A5FI0SqCBpmd8txZcwhuWNAc6RcVi+yN9e3OX4kX/b5EbCPh5+OcmAh2fypwFAp/ZS2sUvhcgJCvvNpfnlwZz4GtbKQAVFAFP8Q9E8Qf+heJHboY0YZgkLHD8dQsXn1y36u0qdtwkczvBlyqXQxXa3+jq+RIkNKufLz8XeYAB9xUcgBO6gsuvFbgVuBlMWte1P0sFxRbWnLIiHwqnSDDY6Hl3koz6j/cBkVfHEur3fDVEGlmzmqmR58 do5lqhzl IuQTlfFDnccDHHW4mvWk479iafutFy2veB3/uuvwMsKQa08zq4qVxcplsjx25HoNhRHEKh1CsXnv6BX5yITA53FXMZQ55vuLxf141dz0iZIrxCnB6xs8+oZyt4qVxdnVb4mic 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: The parameter page in __page_check_anon_rmap() is redundant. Remove it, and convert __page_check_anon_rmap() to __folio_check_anon_rmap(). Signed-off-by: Yajun Deng --- mm/rmap.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 789a2beb8b3a..520607f4d91c 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1154,13 +1154,12 @@ static void __folio_set_anon(struct folio *folio, struct vm_area_struct *vma, } /** - * __page_check_anon_rmap - sanity check anonymous rmap addition + * __folio_check_anon_rmap - sanity check anonymous rmap addition * @folio: The folio containing @page. - * @page: the page to check the mapping of * @vma: the vm area in which the mapping is added * @address: the user virtual address mapped */ -static void __page_check_anon_rmap(struct folio *folio, struct page *page, +static void __folio_check_anon_rmap(struct folio *folio, struct vm_area_struct *vma, unsigned long address) { /* @@ -1176,8 +1175,8 @@ static void __page_check_anon_rmap(struct folio *folio, struct page *page, */ VM_BUG_ON_FOLIO(folio_anon_vma(folio)->root != vma->anon_vma->root, folio); - VM_BUG_ON_PAGE(page_to_pgoff(page) != linear_page_index(vma, address), - page); + VM_BUG_ON_FOLIO(folio_pgoff(folio) != linear_page_index(vma, address), + folio); } /** @@ -1245,7 +1244,7 @@ void page_add_anon_rmap(struct page *page, struct vm_area_struct *vma, __folio_set_anon(folio, vma, address, !!(flags & RMAP_EXCLUSIVE)); } else if (likely(!folio_test_ksm(folio))) { - __page_check_anon_rmap(folio, page, vma, address); + __folio_check_anon_rmap(folio, vma, address); } if (flags & RMAP_EXCLUSIVE) SetPageAnonExclusive(page); -- 2.25.1