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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8D920106F315 for ; Thu, 26 Mar 2026 09:56:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 348306B0108; Thu, 26 Mar 2026 05:56:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2AB176B010C; Thu, 26 Mar 2026 05:56:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 12AEE6B0108; Thu, 26 Mar 2026 05:56:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 01FEF6B0108 for ; Thu, 26 Mar 2026 05:56:39 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C4DF55CA1E for ; Thu, 26 Mar 2026 09:56:39 +0000 (UTC) X-FDA: 84587759718.20.AA17B0D Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf19.hostedemail.com (Postfix) with ESMTP id 9ACEB1A0002 for ; Thu, 26 Mar 2026 09:56:37 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=gdvbDLim; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=PfdLa6dF; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=gdvbDLim; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=PfdLa6dF; spf=pass (imf19.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=gdvbDLim; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=PfdLa6dF; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=gdvbDLim; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=PfdLa6dF; spf=pass (imf19.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1774518997; a=rsa-sha256; cv=none; b=kSxkUvo4d4wzbXpF+vjWk7NHf0ktl81c8qOVa7Yhu9HQ7nGnAY57xFp7vZFirExGAKsDZd MfiD9T+PI5QA0PpH2jXzaVBHnMLqdsjLxVSs2xfKn6Aw0E7I+MyDYn+YZvapQossJVZVzW 7CBxJVLRBg9HTPz8E1cR7Pb95uAiP0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1774518997; 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:in-reply-to:references:references:dkim-signature; bh=5ODd+/BQuyhT8bHEtYfURB336X+kzedB6XCVQ0zG+0Q=; b=cWuuFE53H4AGXHY2Rhuq3AS8PufLMEdgw5tPFC4rLPZT728QC4cAl0vWT824mV92ZltPQw 5OZVc+SgnlFPPKDdgTOGg5kHZ08Ns5uqXrT6SW9tgsnDO8MvUJOe1C9Y5eYE3MAkenAYkh Gm6OIq6OgYaD3/wCEYAEhXeeeReHgU8= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 8F7B84D297; Thu, 26 Mar 2026 09:55:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1774518901; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5ODd+/BQuyhT8bHEtYfURB336X+kzedB6XCVQ0zG+0Q=; b=gdvbDLim8zmPCJ1qENdvp0MmM6r3GQi43VuEIXAfYLWSBgvUFl2/sxWXHIfBQ7BWi14CGR mJynqjBzeNeH/1JI7XFwVet565K3IVUPnGV5gq28caXVt08myoUD7U5Q7mDZKKfAMq3e+i BjMjFIYKIuhKLj2WolfG1CY6EkGZDp8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1774518901; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5ODd+/BQuyhT8bHEtYfURB336X+kzedB6XCVQ0zG+0Q=; b=PfdLa6dFwou+oMgtLWiBAOy2A+qgmui/o6nAS046la0tD95roE5TALf8UT2o6YCLDnrRxF QIoX5RoIyv4HjMDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1774518901; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5ODd+/BQuyhT8bHEtYfURB336X+kzedB6XCVQ0zG+0Q=; b=gdvbDLim8zmPCJ1qENdvp0MmM6r3GQi43VuEIXAfYLWSBgvUFl2/sxWXHIfBQ7BWi14CGR mJynqjBzeNeH/1JI7XFwVet565K3IVUPnGV5gq28caXVt08myoUD7U5Q7mDZKKfAMq3e+i BjMjFIYKIuhKLj2WolfG1CY6EkGZDp8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1774518901; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5ODd+/BQuyhT8bHEtYfURB336X+kzedB6XCVQ0zG+0Q=; b=PfdLa6dFwou+oMgtLWiBAOy2A+qgmui/o6nAS046la0tD95roE5TALf8UT2o6YCLDnrRxF QIoX5RoIyv4HjMDw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 7E0874A0B0; Thu, 26 Mar 2026 09:55:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id h+K7HnUCxWn0YAAAD6G6ig (envelope-from ); Thu, 26 Mar 2026 09:55:01 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 97080A0C76; Thu, 26 Mar 2026 10:54:49 +0100 (CET) From: Jan Kara To: Cc: , Christian Brauner , Al Viro , , Ted Tso , "Tigran A. Aivazian" , David Sterba , OGAWA Hirofumi , Muchun Song , Oscar Salvador , David Hildenbrand , linux-mm@kvack.org, linux-aio@kvack.org, Benjamin LaHaise , Jan Kara , Christoph Hellwig Subject: [PATCH 32/42] fs: Switch inode_has_buffers() to take mapping_metadata_bhs Date: Thu, 26 Mar 2026 10:54:26 +0100 Message-ID: <20260326095354.16340-74-jack@suse.cz> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260326082428.31660-1-jack@suse.cz> References: <20260326082428.31660-1-jack@suse.cz> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=3280; i=jack@suse.cz; h=from:subject; bh=yQzIvf4IB3KCZ27coMo8m+PRy4c1M06bgmEFrRfpbxc=; b=owEBbQGS/pANAwAIAZydqgc/ZEDZAcsmYgBpxQJNbu/pv8bkd4PZg8zqmg70c36DeVE2rB1// 9M/4qC8tfCJATMEAAEIAB0WIQSrWdEr1p4yirVVKBycnaoHP2RA2QUCacUCTQAKCRCcnaoHP2RA 2Z9QCADHHaVkGq0kXrFvkP8hslPwOUIRrl9p2Gkxk7M1eJyfkVbVHmtur5um1W9DvtWvPywIdd6 h1GwzQQJ19H7+B6eXVuMsKXKCSAz81iT6a+Gq8AFolFzURTztYi/+BeGLncyQisl2oFQ5h7LwqI ONlwwc5UX/bGGu5wP5bMgJwU7TDvTRV0Kcir+61ycd1DKemUsz6n+cGg3NsGnyM/sA4zhA1vTZ4 1j16uIlXMGBvWrk07JNgF/m1IfiMccUczNjkgQH/R1L6/JD4kw9zfoMEoFm8+VrpKE4ecsMLAwH IQMXrs+S1J7ZTbwWe9TdmEHQbg4m8AGU8l/glaaGCUw5MtTV X-Developer-Key: i=jack@suse.cz; a=openpgp; fpr=93C6099A142276A28BBE35D815BC833443038D8C Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 9ACEB1A0002 X-Stat-Signature: geapaswa1qwnsag5oco8tmgt93cs5tbo X-Rspam-User: X-HE-Tag: 1774518997-484207 X-HE-Meta: U2FsdGVkX18Z7uWfsBSNyDV/nUwmZ3qLCcA3docwm8pLakGsOtL4I9Q7ot+iE8xBysLZlYdNEmbpOoz4HPmAx7laQiD1iHFeNmRqFRU3Ko/N+uRI3FOHPBpPL0gcYRMiYbLAZuw8mI4pGODicNHTCb9wjRHtr5e9XYE5zEdrc+X2A5ETt6yGQ6PFOmJUz19AJ+UnYx1oknDgZF5SpRtYUqL3/+t6fGuX66uqln6QZw1np8Cjdrhevvi1IHemC49TRLj5jU6S91z9r+JA7PG7hctIIdWO18M+KQORs7mawt1o+C8PZ1xrGLGzY2OfZi6QoS3Az33I4vqCTks5Quw3a5s4/IROSiC/XixhdIx++yigiFXzMzQIoK37WJ4YuaxdC5S4OWpE0hfOkxech98brf4+wKvGYzQ456sTnMD6gc375JkTeVR1e9m7F8Ayfehawu3hHvJB9XTgzVZcHA2Iwl/e29H+di8YKb+i9QKaQG1RwXHCmgXL9LSyN770tvcwvdYke/uUqDgZyYqqmKT1wVp1e9ZOU80X6CBF8QVJY7lKfomMYSBoRZu9LHAzisHYgV51dJIDUREY/A7CTwfbZUmA9gb6WxJPC1NYsnFRBx0xtJt9DM/C9YnnXXce+AKgm3AqA9sp2NIBtNPiERFA/+gee2i+/uphbQbKlUnlnx4IES6JnPYltHViYLG4RM6++QQqJ5a0Jnm3C1MvxRN/NSafwO4uFCqmQ3ysC4Pgj17zsw/jGktvQXm1f7c3d+HIPyDK6plYzp3V3jSTPQrorPA83dA7yY5CRvh6igimbUfNHx4gwGwhQnZlpp4HgL9RbjUuzykVF0Ac6pOcekRIYAKVP57DXw0pUVV6jTazJpzqLrGlGIwPIkmENz7YPF9R2RSVb8QVfo8LcSHhZFt8mEGOWF+abnl3d5+mOBteOJw4MPAsioI+c3m3qipORNBIxGVGm/x0hryPmg2Lnvj RXt5kw/I Al2BRJ87Vd1jlKb0sY+WAObhKGOlWA4ciifdhdXV8dbmhk3Q= Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: As part of a move towards placing mapping_metadata_bhs in fs-private inode part, switch inode_has_buffers() to take mapping_metadata_bhs and rename the function to mmb_has_buffers(). Reviewed-by: Christoph Hellwig Signed-off-by: Jan Kara --- fs/buffer.c | 14 +++++++------- fs/ext4/inode.c | 2 +- include/linux/buffer_head.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index 67b3d4624503..b0436481d0f1 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -468,7 +468,7 @@ EXPORT_SYMBOL(mark_buffer_async_write); * written back and waited upon before fsync() returns. * * The functions mark_buffer_dirty_inode(), fsync_inode_buffers(), - * inode_has_buffers() and invalidate_inode_buffers() are provided for the + * mmb_has_buffers() and invalidate_inode_buffers() are provided for the * management of a list of dependent buffers in mapping_metadata_bhs struct. * * The locking is a little subtle: The list of buffer heads is protected by @@ -526,11 +526,11 @@ static void remove_assoc_queue(struct buffer_head *bh) } } -int inode_has_buffers(struct inode *inode) +bool mmb_has_buffers(struct mapping_metadata_bhs *mmb) { - return !list_empty(&inode->i_data.i_metadata_bhs.list); + return !list_empty(&mmb->list); } -EXPORT_SYMBOL_GPL(inode_has_buffers); +EXPORT_SYMBOL_GPL(mmb_has_buffers); /** * sync_mapping_buffers - write out & wait upon a mapping's "associated" buffers @@ -561,7 +561,7 @@ int sync_mapping_buffers(struct address_space *mapping) struct blk_plug plug; LIST_HEAD(tmp); - if (list_empty(&mmb->list)) + if (!mmb_has_buffers(mmb)) return 0; blk_start_plug(&plug); @@ -803,9 +803,9 @@ EXPORT_SYMBOL(block_dirty_folio); */ void invalidate_inode_buffers(struct inode *inode) { - if (inode_has_buffers(inode)) { - struct mapping_metadata_bhs *mmb = &inode->i_data.i_metadata_bhs; + struct mapping_metadata_bhs *mmb = &inode->i_data.i_metadata_bhs; + if (mmb_has_buffers(mmb)) { spin_lock(&mmb->lock); while (!list_empty(&mmb->list)) __remove_assoc_queue(mmb, BH_ENTRY(mmb->list.next)); diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 6f892abef003..011cb2eb16a2 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3436,7 +3436,7 @@ static bool ext4_inode_datasync_dirty(struct inode *inode) } /* Any metadata buffers to write? */ - if (inode_has_buffers(inode)) + if (mmb_has_buffers(&inode->i_mapping->i_metadata_bhs)) return true; return inode_state_read_once(inode) & I_DIRTY_DATASYNC; } diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 20636599d858..44094fd476f5 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -515,7 +515,7 @@ bool block_dirty_folio(struct address_space *mapping, struct folio *folio); void buffer_init(void); bool try_to_free_buffers(struct folio *folio); -int inode_has_buffers(struct inode *inode); +bool mmb_has_buffers(struct mapping_metadata_bhs *mmb); void invalidate_inode_buffers(struct inode *inode); int sync_mapping_buffers(struct address_space *mapping); void invalidate_bh_lrus(void); -- 2.51.0