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 ED48FECAAA1 for ; Mon, 12 Sep 2022 03:29:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229760AbiILD32 (ORCPT ); Sun, 11 Sep 2022 23:29:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229701AbiILD2w (ORCPT ); Sun, 11 Sep 2022 23:28:52 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88CE4275FD for ; Sun, 11 Sep 2022 20:28:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id E8B40CE0E79 for ; Mon, 12 Sep 2022 03:28:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36075C433D6; Mon, 12 Sep 2022 03:28:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1662953318; bh=+g2aB9psoWfEq45yYdoQiT8l6hgLDPFZguw43EDSTOA=; h=Date:To:From:Subject:From; b=Xyaip4G45Ek/tU4WDvCHwtwrocBXfj0eXIVX59JVS6uL9KXim/y8M/Hk5tIi5gCON X2UZdFDouGTKdRmDmMTIBz5w7hDsmPM6MSQn8zyrA5tfRv1z1ctu/poheMDgDd9M2h ZXhUe/61naBbd2E8mlxmdOlRTjHlL1AO8WyQdcOA= Date: Sun, 11 Sep 2022 20:28:37 -0700 To: mm-commits@vger.kernel.org, vitaly.wool@konsulko.com, sjenning@redhat.com, ddstreet@ieee.org, hch@lst.de, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-remove-the-end_write_func-argument-to-__swap_writepage.patch removed from -mm tree Message-Id: <20220912032838.36075C433D6@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/swap: remove the end_write_func argument to __swap_writepage has been removed from the -mm tree. Its filename was mm-remove-the-end_write_func-argument-to-__swap_writepage.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: Christoph Hellwig Subject: mm/swap: remove the end_write_func argument to __swap_writepage Date: Thu, 11 Aug 2022 16:17:41 +0200 The argument is always set to end_swap_bio_write, so remove the argument and mark end_swap_bio_write static. Link: https://lkml.kernel.org/r/20220811141741.660214-1-hch@lst.de Signed-off-by: Christoph Hellwig Cc: Seth Jennings Cc: Dan Streetman Cc: Vitaly Wool Signed-off-by: Andrew Morton --- mm/page_io.c | 9 ++++----- mm/swap.h | 4 +--- mm/zswap.c | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) --- a/mm/page_io.c~mm-remove-the-end_write_func-argument-to-__swap_writepage +++ a/mm/page_io.c @@ -28,7 +28,7 @@ #include #include "swap.h" -void end_swap_bio_write(struct bio *bio) +static void end_swap_bio_write(struct bio *bio) { struct page *page = bio_first_page_all(bio); @@ -202,7 +202,7 @@ int swap_writepage(struct page *page, st end_page_writeback(page); goto out; } - ret = __swap_writepage(page, wbc, end_swap_bio_write); + ret = __swap_writepage(page, wbc); out: return ret; } @@ -332,8 +332,7 @@ static int swap_writepage_fs(struct page return 0; } -int __swap_writepage(struct page *page, struct writeback_control *wbc, - bio_end_io_t end_write_func) +int __swap_writepage(struct page *page, struct writeback_control *wbc) { struct bio *bio; int ret; @@ -358,7 +357,7 @@ int __swap_writepage(struct page *page, REQ_OP_WRITE | REQ_SWAP | wbc_to_write_flags(wbc), GFP_NOIO); bio->bi_iter.bi_sector = swap_page_sector(page); - bio->bi_end_io = end_write_func; + bio->bi_end_io = end_swap_bio_write; bio_add_page(bio, page, thp_size(page), 0); bio_associate_blkg_from_page(bio, page); --- a/mm/swap.h~mm-remove-the-end_write_func-argument-to-__swap_writepage +++ a/mm/swap.h @@ -18,9 +18,7 @@ static inline void swap_read_unplug(stru } void swap_write_unplug(struct swap_iocb *sio); int swap_writepage(struct page *page, struct writeback_control *wbc); -void end_swap_bio_write(struct bio *bio); -int __swap_writepage(struct page *page, struct writeback_control *wbc, - bio_end_io_t end_write_func); +int __swap_writepage(struct page *page, struct writeback_control *wbc); /* linux/mm/swap_state.c */ /* One swap address space for each 64M swap space */ --- a/mm/zswap.c~mm-remove-the-end_write_func-argument-to-__swap_writepage +++ a/mm/zswap.c @@ -1026,7 +1026,7 @@ static int zswap_writeback_entry(struct SetPageReclaim(page); /* start writeback */ - __swap_writepage(page, &wbc, end_swap_bio_write); + __swap_writepage(page, &wbc); put_page(page); zswap_written_back_pages++; _ Patches currently in -mm which might be from hch@lst.de are frontswap-dont-call-init-if-no-ops-are-registered.patch