Received: by 2002:a05:6500:1b8f:b0:1fa:5c73:8e2d with SMTP id df15csp1392398lqb; Thu, 30 May 2024 08:53:39 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUAAJ1EBruDUFlCZJcGnf0QIBBS4zgQoE6AaRPQ9VcVktfTiYeQkI9yPgzJMj1bmCSYhCzoJT8WDJ5W15Xex9SKW7r1nUci0ziu5FGlxQ== X-Google-Smtp-Source: AGHT+IHema3C3F0jS5ydiV5ZAZE7lSBwdELVpr8Zow8DyLzQIV5S+2ne6WUcqDKttjLs4TlNw+BZ X-Received: by 2002:a50:cc9a:0:b0:578:638d:4b45 with SMTP id 4fb4d7f45d1cf-57a177af677mr1593476a12.18.1717084419554; Thu, 30 May 2024 08:53:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717084419; cv=pass; d=google.com; s=arc-20160816; b=vpBj2ZpjpbJKd+VWnaqoWvfcMPG3/5IqZRd4y2/DvgAOCQO19sRqIPqjSCHDicjw2C HNmGnxVRRxWPCdLNBLJ/ooik6rPDfMC6TBszxayQH4x2mcudAk7GhM2yjD5d2wkjCaxW o7qt/9mR/KYUStbtiKI62KEOJPbUwVGt3U+QCFsERJShBCIQKX+tM6z2SKbulbeQsTAp RG169CgrYs69eKjjKH9CoF018HZQxoVXzuaAAGBvXAAJthfV53HEiJrFjIPTQug7XD6+ 6+dAazT5bBwAXPQFImUDmEmcW1bI+vxmNnzjJClmOhQeY1sbvPL6Z5KOpe+0zOlEiwHf pPSQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-disposition:mime-version:list-unsubscribe:list-subscribe :list-id:precedence:message-id:subject:cc:to:from:date :dkim-signature; bh=Lju3hqzSD9daaRrPNdpL2GJx8prw1cj6Sa0j8kjBSHc=; fh=aznqSYAhe5NzYgYLW/V7xbfSEyFesCegLqxoNj8hWd8=; b=L2Ez65DbALCJzSrKZewr5SMBJ1mFRmBSoA6sNUN+0WJB1k1XaQerBKBoPiIlSTUwwK FaoLxpxISpdmnAnO5HsL+jCqWbkufUKlXVmqUhl+OiE5c2crGQldAOpxIR4WAsmY+dLN PC9vjk+DS4DsUlvF9jaMpx8VCxSL5RIxgI+DgTv5jzi7skkF76aros0mLMIihrQfLsK5 gf1PauQM0ZNfLyQI/0bM8rXwOEk2QwEE9rU6YLue+8cbWeEee6gkuX2AsIDGLhmF6uoJ j/J2Q+D5EI4lsf80vEtYtIfGG826UYlV2TjIaKtGwj/eTQVTkC79rEyIgtaKjsfrR9d0 0BZg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=PmCK0WEa; arc=pass (i=1 spf=pass spfdomain=linux.dev dkim=pass dkdomain=linux.dev dmarc=pass fromdomain=linux.dev); spf=pass (google.com: domain of linux-kernel+bounces-195625-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-195625-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id 4fb4d7f45d1cf-57869c06c94si6607996a12.161.2024.05.30.08.53.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 May 2024 08:53:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-195625-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=PmCK0WEa; arc=pass (i=1 spf=pass spfdomain=linux.dev dkim=pass dkdomain=linux.dev dmarc=pass fromdomain=linux.dev); spf=pass (google.com: domain of linux-kernel+bounces-195625-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-195625-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 3B5631F24AE5 for ; Thu, 30 May 2024 15:53:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 722F8200AE; Thu, 30 May 2024 15:53:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="PmCK0WEa" Received: from out-186.mta1.migadu.com (out-186.mta1.migadu.com [95.215.58.186]) (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 C7901187543 for ; Thu, 30 May 2024 15:53:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.186 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717084404; cv=none; b=cU8sMsTXZMF2XrPpo2cf8mqbT/PcYsu6DkUh7JOdJj+9Arorwy44jfbWBd/KxTKVpItDqr0oBYVBAaLzGwxb/fBxoxYP1Ar2f6+l/d74u0OJc4mEYxGj5FeYVHOmtcvXrscIn+uRxffBPtPSGxqbrdSgDGm1TbI0JE1AVLZhXQU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717084404; c=relaxed/simple; bh=NSONyl0eiFjI01Ei5b30Lbe/WtgsxxNI98rO5Yb71+o=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=QENVT4oIEX9xsocnCKi6oHqekQcJlsXRlqmEhJjz1R40sK00EJP08YEBuzed9lwCOsEzgCJ1yNONhZG83bgnIhZYs+gDbrZmV3E7Gp7fJXvC7PQUn+Lqe94pk7/W9Of1J6D6ZnPEwGzPb9WL/cvvJlRHGPayOFAS3nzcF1SPJvU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=PmCK0WEa; arc=none smtp.client-ip=95.215.58.186 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev X-Envelope-To: torvalds@linux-foundation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1717084399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=Lju3hqzSD9daaRrPNdpL2GJx8prw1cj6Sa0j8kjBSHc=; b=PmCK0WEa5bE3ivUVwP3VSqP/jXSOdD1oMKoA6CoUnF1SQ1R7amoJeoqX3eOB6Fq8SKJP09 98Xv3/Gqic8sQ3Sj39Vw6zilSp708tj4Pc6GwSDyBemMvD/OMcrtG9Bkman7IWl9zI3ti0 Th7l6zvsxSPxwSzPQXOPTrwFlAuoncI= X-Envelope-To: linux-bcachefs@vger.kernel.org X-Envelope-To: linux-fsdevel@vger.kernel.org X-Envelope-To: linux-kernel@vger.kernel.org Date: Thu, 30 May 2024 11:53:16 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Kent Overstreet To: Linus Torvalds Cc: linux-bcachefs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT PULL] bcachefs fixes for 6.10-rc2 Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Migadu-Flow: FLOW_OUT Hi Linus, assorted odds and ends... important note for users: BCH_DATA_unstriped (accounting for unstriped data in stripe buckets) is arriving next merge window (which requires regenerating alloc info on mount if erasure coding is enabled), and the disk accounting rewrite (at long last!) is also in my master branch and arriving next merge window - which requires regenerating alloc info for everyone. disk accounting rewrite brings per-snapshot-id accounting, per-btree accounting, accounting for pending rebalance work, compression type/ratio accounting. everything should be in place to make this a smooth upgrade progress, except for getting a progress indicator plumbed through so users aren't left wondering "why is my mount so slow? is it hung?" which we're going to try to do as well. The following changes since commit d93ff5fa40b9db5f505d508336bc171f54db862e: bcachefs: Fix race path in bch2_inode_insert() (2024-05-22 20:37:47 -0400) are available in the Git repository at: https://evilpiepirate.org/git/bcachefs.git tags/bcachefs-2024-05-30 for you to fetch changes up to 7b038b564b3e2a752d2211e7b0c3c29fd2f6e197: bcachefs: Fix failure to return error on misaligned dio write (2024-05-29 16:40:30 -0400) ---------------------------------------------------------------- bcachefs fixes for 6.10-rc2 - two downgrade fixes - a couple snapshot deletion and repair fixes, thanks to noradtux for finding these and providing the image to debug them - a couple assert fixes - convert to folio helper, from Matthew - some improved error messages - bit of code reorganization (just moving things around); doing this while things are quiet so I'm not rebasing fixes past reorgs - don't return -EROFS on inconsistency error in recovery, this confuses util-linux and has it retry the mount - fix failure to return error on misaligned dio write; reported as an issue with coreutils shred ---------------------------------------------------------------- Jeff Johnson (1): bcachefs: add missing MODULE_DESCRIPTION() Kent Overstreet (19): bcachefs: Fix debug assert bcachefs: Fix sb-downgrade validation bcachefs: Plumb bkey into __btree_err() bcachefs: Fix lookup_first_inode() when inode_generations are present bcachefs: Fix locking assert bcachefs: Refactor delete_dead_snapshots() bcachefs: Run check_key_has_snapshot in snapshot_delete_keys() bcachefs: Fix setting of downgrade recovery passes/errors bcachefs: btree_gc can now handle unknown btrees bcachefs: Better fsck error message for key version bcachefs: split out sb-members_format.h bcachefs: split out sb-downgrade_format.h bcachefs: Split out disk_groups_format.h bcachefs: Split out replicas_format.h bcachefs: Split out journal_seq_blacklist_format.h bcachefs: Split out sb-errors_format.h bcachefs: Fix uninitialized var warning bcachefs: Don't return -EROFS from mount on inconsistency error bcachefs: Fix failure to return error on misaligned dio write Matthew Wilcox (Oracle) (1): bcachefs: Use copy_folio_from_iter_atomic() fs/bcachefs/backpointers.c | 2 +- fs/bcachefs/bcachefs.h | 44 +---- fs/bcachefs/bcachefs_format.h | 195 +------------------ fs/bcachefs/btree_gc.c | 18 +- fs/bcachefs/btree_gc.h | 44 ++--- fs/bcachefs/btree_gc_types.h | 29 +++ fs/bcachefs/btree_io.c | 85 +++++---- fs/bcachefs/btree_key_cache.c | 10 +- fs/bcachefs/buckets.c | 2 +- fs/bcachefs/disk_groups_format.h | 21 ++ fs/bcachefs/ec.c | 2 +- fs/bcachefs/fs-io-buffered.c | 6 +- fs/bcachefs/fs-io-direct.c | 4 +- fs/bcachefs/fs.c | 12 +- fs/bcachefs/fsck.c | 51 ++--- fs/bcachefs/journal_seq_blacklist_format.h | 15 ++ fs/bcachefs/mean_and_variance_test.c | 1 + fs/bcachefs/replicas_format.h | 31 +++ fs/bcachefs/sb-downgrade.c | 13 +- fs/bcachefs/sb-downgrade_format.h | 17 ++ fs/bcachefs/sb-errors_format.h | 296 +++++++++++++++++++++++++++++ fs/bcachefs/sb-errors_types.h | 281 --------------------------- fs/bcachefs/sb-members_format.h | 110 +++++++++++ fs/bcachefs/snapshot.c | 88 +++++---- fs/bcachefs/snapshot.h | 1 + fs/bcachefs/super-io.c | 12 +- fs/bcachefs/super.c | 2 +- 27 files changed, 706 insertions(+), 686 deletions(-) create mode 100644 fs/bcachefs/btree_gc_types.h create mode 100644 fs/bcachefs/disk_groups_format.h create mode 100644 fs/bcachefs/journal_seq_blacklist_format.h create mode 100644 fs/bcachefs/replicas_format.h create mode 100644 fs/bcachefs/sb-downgrade_format.h create mode 100644 fs/bcachefs/sb-errors_format.h create mode 100644 fs/bcachefs/sb-members_format.h