From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8FB3A3148C6 for ; Thu, 28 Aug 2025 14:16:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756390597; cv=none; b=EdZJ38Zrp3jrp2zcgsOYltHSJXKRZrFsHPpKulcmDuIqKdQuT4ukBLux/OIYxaERsY7kN3HNd5tly8Mfcse5L3tKi5X+0EkUfofwRnoPYFB+yxUxHJino4kd8fRKtcxaMWWNytu096uXuyU/yojs9pHRIG85UcmM9SewOTpZmKs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756390597; c=relaxed/simple; bh=Biz+J4UJf3105vDqv48t0npPEOyN5B9Y/P9Ez2gOm0s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=D/osnaORsbLH7CTPt+6gM4cUDk3Yi3bnbjkevwPvfjNObgk71afniFMTnzAvNTmUkojHpMs1qhuffYxi44CiUys2o32T3hR7OlEqcGOW+JNUQoGujWQwx0RqxbKr3Rj5gBAnLWak+rGDiRn+O0eyWIrGO2anZTzPiDpVIX66M5Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=paCS3sCe; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="paCS3sCe" Received: by smtp.kernel.org (Postfix) with ESMTPS id 55718C4CEFC; Thu, 28 Aug 2025 14:16:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756390597; bh=Biz+J4UJf3105vDqv48t0npPEOyN5B9Y/P9Ez2gOm0s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=paCS3sCebooxZBy6s+Bp6aDZl4Wp05lbr34JcPEQZBD5wVqCJZFTCfCnpsPSwiWl6 JtGfiwg8C+T8hzjUAmVSRjnbV6koPPrfCtj5DBJkn/kb38SOF75menadKBx3Gzld+X FRfFNMSa+87tfmNRUonXuHoD0/p31OP92A8Gj8V6BzA2RNBMZMmaFld6YJUoUAZ2r7 nJcjxPOwrpr+jHjnrFV58pKthJNkFUPJdCHHiMzXqhOJMKMWWk1/itN5crwHmfQbvh gQb/wtwkPAofkg9O4ilN+TA3WL8oX0mEmWrqrTZ11KiVtpkVrvX3x3Z8DWzNi3uUW9 L82/SBPhA/kLQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D8ECCA0FFF; Thu, 28 Aug 2025 14:16:37 +0000 (UTC) From: Nikita Ofitserov via B4 Relay Date: Thu, 28 Aug 2025 17:16:08 +0300 Subject: [PATCH v2 06/15] bcachefs: Partially fix old device removal with unknown btrees Precedence: bulk X-Mailing-List: linux-bcachefs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250828-better-progress-v2-6-c088a2003940@gmail.com> References: <20250828-better-progress-v2-0-c088a2003940@gmail.com> In-Reply-To: <20250828-better-progress-v2-0-c088a2003940@gmail.com> To: Kent Overstreet Cc: linux-bcachefs@vger.kernel.org, Nikita Ofitserov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1096; i=himikof@gmail.com; h=from:subject:message-id; bh=bg0JYtLQrNAfIJ37svWrnw+bIZLtdUmPleY43qcm2QE=; b=owGbwMvMwCW2edHtzWZP9DIYT6slMWRsSDloYazxwsX7hNPLm3mnt3n+mPbe5/Gt+f8Tb/Lye n+wdfzzrqOUhUGMi0FWTJHlw5Kvf9ZkWv+xFNprCDOHlQlkCAMXpwBMZJY8wz/rX+cWid2xy96/ wvX5lSxnC54kjqL0CCOPFztKHovNmiTP8D+F7c1r99LlUSZ7yhOW3bPYNeua2Cyj0GP5sR8k9wV c+cANAA== X-Developer-Key: i=himikof@gmail.com; a=openpgp; fpr=F0A4F5FCAC693BFC3912BD31B3A2DBB336E42E68 X-Endpoint-Received: by B4 Relay for himikof@gmail.com/default with auth_id=452 X-Original-From: Nikita Ofitserov Reply-To: himikof@gmail.com From: Nikita Ofitserov Handle removal of unknown metadata only, data pointed to by unknown btrees cannot be supported currently. Signed-off-by: Nikita Ofitserov --- fs/bcachefs/migrate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/bcachefs/migrate.c b/fs/bcachefs/migrate.c index 41657deb0e3807f4968272491faea09d05ec2299..4aa7dd483cab5a400974b5824bfaf0c0af2e9331 100644 --- a/fs/bcachefs/migrate.c +++ b/fs/bcachefs/migrate.c @@ -121,6 +121,7 @@ static int bch2_dev_usrdata_drop(struct bch_fs *c, { CLASS(btree_trans, trans)(c); + /* FIXME: this does not handle unknown btrees with data pointers */ for (unsigned id = 0; id < BTREE_ID_NR; id++) { if (!btree_type_has_data_ptrs(id)) continue; @@ -161,7 +162,7 @@ static int bch2_dev_metadata_drop(struct bch_fs *c, bch2_bkey_buf_init(&k); closure_init_stack(&cl); - for (id = 0; id < BTREE_ID_NR; id++) { + for (id = 0; id < btree_id_nr_alive(c); id++) { bch2_trans_node_iter_init(trans, &iter, id, POS_MIN, 0, 0, BTREE_ITER_prefetch); retry: -- 2.50.1