From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 314413BC68E; Wed, 30 Sep 2026 18:58:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790794695; cv=none; b=nKQ1YyTEdBZb7M3ADDvnTf3AxDcutTCZyncxGkMNo3aylRjTcyxnumuO98xX6KSG7L2dNNPGOZOrCQY9+++ulb5jK3zAUjdBd+8JeDPST3Tk+6vg4Q0G+1f7dP6NPQ4diZCYYSBn5JNdlvATK11pvcqWU4MSyr+SQ//Z1bWe0tg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790794695; c=relaxed/simple; bh=w5kPfRNJKOwopvZ/eSUXSvG1R4K+V2Ator0/WVtZvm0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LtcHqSHPsQuKb9I/bCANydALTAtF859tP/LQ4TBDCJOldujYykbYTY0nxtVui35Uu1YiujI7ed7OPLaWjVEF35HS0sOp1mD4uWod8cbwZpsz0s3mahopbqac5WcpRP17zJwLp39+nbX9qUf+sH/IkBtysoGBQRklwO4CkFV6jKo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kWTTIz8e; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="kWTTIz8e" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DA921F000FF; Wed, 30 Sep 2026 18:58:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790794694; bh=mgtasWhIc9wFapihHPnIlI4OjxnIwNJb8pNiVa5TrUA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kWTTIz8e+EUvEnaqHIY6ypLWXmNGcVBTeNnTZyELlSa4irt++jYgLRnEtxyGWCeJd dIihfw09L014IUv5VgzMKCAQxuspJwa8r+2oZmL/H/m7XwmZBOk+O9ypn69Xu/+OGk RHmlKJ0gFNud3Oq1nguQ/wR6fHaMK7CdB4uP6R4A= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Filipe Manana , Dave Chen , David Sterba , Sasha Levin Subject: [PATCH 6.6 0301/1193] btrfs: only account delalloc bytes for regular file inodes in btrfs_getattr() Date: Wed, 30 Sep 2026 17:16:25 +0200 Message-ID: <20260930152440.841388540@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152434.301151190@linuxfoundation.org> References: <20260930152434.301151190@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Chen [ Upstream commit 9411aafdf352b8d72668732af5a37dcb27383e25 ] btrfs_getattr() unconditionally reads BTRFS_I(inode)->new_delalloc_bytes and adds it (sector-aligned) to stat->blocks for every inode type. However, new_delalloc_bytes lives in a union with last_dir_index_offset: union { u64 new_delalloc_bytes; /* files only */ u64 last_dir_index_offset; /* directories only */ }; For a directory inode this memory holds last_dir_index_offset, which is set during directory logging (e.g. flush_dir_items_batch()) to the offset of the last logged BTRFS_DIR_INDEX_KEY. That offset grows with the number of entries ever created in the directory (dir indexes are monotonic and never reused), so it can be arbitrarily large. As a result, after a directory has been logged (e.g. via an fsync that triggers directory logging), btrfs_getattr() reports inflated st_blocks for that directory. The inflation is purely in-core and disappears after the inode is evicted and reloaded (btrfs_alloc_inode() zeroes the union), e.g. after a remount. Reproducer (on a btrfs filesystem): D=/mnt/btrfs/d mkdir -p $D for i in $(seq 1 20000); do touch $D/f$i; done sync # commit, push dir index high touch $D/trigger # dirty the dir in a new transaction xfs_io -c fsync $D # log the directory -> sets last_dir_index_offset stat -c '%b' $D # st_blocks is now inflated (e.g. 40) # umount + mount -> st_blocks drops back to the correct value The evict path already knows this union is type-dependent and guards the corresponding WARN_ON with !S_ISDIR() in btrfs_destroy_inode(); only btrfs_getattr() was missing the equivalent check. Only read new_delalloc_bytes for regular files, which are the only inodes that ever set it. Reviewed-by: Filipe Manana Signed-off-by: Dave Chen Signed-off-by: Filipe Manana Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index e843531201bef..d04965bbae428 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -8841,7 +8841,8 @@ static int btrfs_getattr(struct mnt_idmap *idmap, stat->dev = BTRFS_I(inode)->root->anon_dev; spin_lock(&BTRFS_I(inode)->lock); - delalloc_bytes = BTRFS_I(inode)->new_delalloc_bytes; + delalloc_bytes = S_ISREG(inode->i_mode) ? + BTRFS_I(inode)->new_delalloc_bytes : 0; inode_bytes = inode_get_bytes(inode); spin_unlock(&BTRFS_I(inode)->lock); stat->blocks = (ALIGN(inode_bytes, blocksize) + -- 2.53.0