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 D37D2C77B76 for ; Fri, 21 Apr 2023 21:52:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233746AbjDUVwp (ORCPT ); Fri, 21 Apr 2023 17:52:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233719AbjDUVwl (ORCPT ); Fri, 21 Apr 2023 17:52:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 380D31BC2 for ; Fri, 21 Apr 2023 14:52:40 -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 dfw.source.kernel.org (Postfix) with ESMTPS id C597965326 for ; Fri, 21 Apr 2023 21:52:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25FEAC433D2; Fri, 21 Apr 2023 21:52:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1682113959; bh=BSrjc2K+Hi6UrHE9dhX1NwoJ5JAzirR8tmueP5AZsJk=; h=Date:To:From:Subject:From; b=HqwPSJP/3IKxMwhu2A87cYyjcwaYwcHUq3GVsZ2F1qPa6LRqRtoVDzjXn3hC1W6Yc 7XSCOlrXCJtmUqqrWIjdQ4aDofkGsw3KJ6MBq3NqDYOTV3xQUqI2HvVTpPz10JktfC T1dOlLnz73IPv0SDsCQDLQkjbm0y7cpjR+spdqQg= Date: Fri, 21 Apr 2023 14:52:38 -0700 To: mm-commits@vger.kernel.org, willy@infradead.org, viro@zeniv.linux.org.uk, mcgrof@kernel.org, hare@suse.de, brauner@kernel.org, p.raghav@samsung.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] fs-buffer-add-folio_set_bh-helper.patch removed from -mm tree Message-Id: <20230421215239.25FEAC433D2@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: fs/buffer: add folio_set_bh helper has been removed from the -mm tree. Its filename was fs-buffer-add-folio_set_bh-helper.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: Pankaj Raghav Subject: fs/buffer: add folio_set_bh helper Date: Mon, 17 Apr 2023 14:36:15 +0200 Patch series "convert create_page_buffers to folio_create_buffers". One of the first kernel panic we hit when we try to increase the block size > 4k is inside create_page_buffers()[1]. Even though buffer.c function do not support large folios (folios > PAGE_SIZE) at the moment, these changes are required when we want to remove that constraint. This patch (of 4): The folio version of set_bh_page(). This is required to convert create_page_buffers() to folio_create_buffers() later in the series. Link: https://lkml.kernel.org/r/20230417123618.22094-1-p.raghav@samsung.com Link: https://lkml.kernel.org/r/20230417123618.22094-2-p.raghav@samsung.com Signed-off-by: Pankaj Raghav Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: Hannes Reinecke Cc: Alexander Viro Cc: Christian Brauner Cc: Luis Chamberlain Signed-off-by: Andrew Morton --- fs/buffer.c | 15 +++++++++++++++ include/linux/buffer_head.h | 2 ++ 2 files changed, 17 insertions(+) --- a/fs/buffer.c~fs-buffer-add-folio_set_bh-helper +++ a/fs/buffer.c @@ -1485,6 +1485,21 @@ void set_bh_page(struct buffer_head *bh, } EXPORT_SYMBOL(set_bh_page); +void folio_set_bh(struct buffer_head *bh, struct folio *folio, + unsigned long offset) +{ + bh->b_folio = folio; + BUG_ON(offset >= folio_size(folio)); + if (folio_test_highmem(folio)) + /* + * This catches illegal uses and preserves the offset: + */ + bh->b_data = (char *)(0 + offset); + else + bh->b_data = folio_address(folio) + offset; +} +EXPORT_SYMBOL(folio_set_bh); + /* * Called when truncating a buffer on a page completely. */ --- a/include/linux/buffer_head.h~fs-buffer-add-folio_set_bh-helper +++ a/include/linux/buffer_head.h @@ -196,6 +196,8 @@ void mark_buffer_write_io_error(struct b void touch_buffer(struct buffer_head *bh); void set_bh_page(struct buffer_head *bh, struct page *page, unsigned long offset); +void folio_set_bh(struct buffer_head *bh, struct folio *folio, + unsigned long offset); bool try_to_free_buffers(struct folio *); struct buffer_head *alloc_page_buffers(struct page *page, unsigned long size, bool retry); _ Patches currently in -mm which might be from p.raghav@samsung.com are