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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BA49C001DB for ; Fri, 11 Aug 2023 23:13:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237073AbjHKXND (ORCPT ); Fri, 11 Aug 2023 19:13:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236859AbjHKXNB (ORCPT ); Fri, 11 Aug 2023 19:13:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 064154681 for ; Fri, 11 Aug 2023 16:02:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9A9B3666E3 for ; Fri, 11 Aug 2023 23:02:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDCD4C433C8; Fri, 11 Aug 2023 23:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1691794950; bh=XPtGC53tiFS4hkU9jTK5tqrSV5aQ+v9N9Z8+iraa2tw=; h=Date:To:From:Subject:From; b=v7a5eo7wlVLTFkH/HsY7DGwrjaTmdo90rdwgAaL+s5Ttez1vI0iVja+NiThLE6Ifa iYgcuwRJ1LvaVVynIlMLwlBotyRs++7p1q+gl8oHIAa0+5TDpkjvgfO4sxCDV8HofC CCLkFR+XEUmH7Sj7Ijdg+pZe0ESe+EZZloXAcplo= Date: Fri, 11 Aug 2023 16:02:29 -0700 To: mm-commits@vger.kernel.org, willy@infradead.org, wangkefeng.wang@huawei.com, sunnanyong@huawei.com, sidhartha.kumar@oracle.com, hch@infradead.org, zhangpeng362@huawei.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-page_io-use-a-folio-in-__end_swap_bio_read.patch removed from -mm tree Message-Id: <20230811230229.EDCD4C433C8@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: mm/page_io: use a folio in __end_swap_bio_read() has been removed from the -mm tree. Its filename was mm-page_io-use-a-folio-in-__end_swap_bio_read.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: ZhangPeng Subject: mm/page_io: use a folio in __end_swap_bio_read() Date: Fri, 21 Jul 2023 11:44:46 +0800 Saves one implicit call to compound_head(). Link: https://lkml.kernel.org/r/20230721034451.16412-6-zhangpeng362@huawei.com Signed-off-by: ZhangPeng Cc: Christoph Hellwig Cc: Kefeng Wang Cc: Matthew Wilcox (Oracle) Cc: Nanyong Sun Cc: Sidhartha Kumar Signed-off-by: Andrew Morton --- mm/page_io.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/mm/page_io.c~mm-page_io-use-a-folio-in-__end_swap_bio_read +++ a/mm/page_io.c @@ -57,16 +57,16 @@ static void end_swap_bio_write(struct bi static void __end_swap_bio_read(struct bio *bio) { - struct page *page = bio_first_page_all(bio); + struct folio *folio = bio_first_folio_all(bio); if (bio->bi_status) { pr_alert_ratelimited("Read-error on swap-device (%u:%u:%llu)\n", MAJOR(bio_dev(bio)), MINOR(bio_dev(bio)), (unsigned long long)bio->bi_iter.bi_sector); } else { - SetPageUptodate(page); + folio_mark_uptodate(folio); } - unlock_page(page); + folio_unlock(folio); } static void end_swap_bio_read(struct bio *bio) _ Patches currently in -mm which might be from zhangpeng362@huawei.com are mm-kmsan-use-helper-function-page_size.patch mm-kmsan-use-helper-macro-offset_in_page.patch mm-kmsan-use-helper-macros-page_align-and-page_align_down.patch mm-remove-redundant-k-macro-definition.patch mm-swapfilec-use-helper-macro-k.patch mm-swap_statec-use-helper-macro-k.patch mm-shmemc-use-helper-macro-k.patch mm-nommuc-use-helper-macro-k.patch mm-mmapc-use-helper-macro-k.patch mm-hugetlbc-use-helper-macro-k.patch mm-page_alloc-remove-unused-parameter-from-reserve_highatomic_pageblock.patch