Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp4017449rdg; Wed, 18 Oct 2023 12:19:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFIoc072F3XpbEjEj0lkRngacKvNxlDn74lVBR0VfQoDjGOMUPKkvJiXKshokTE2pAwP8jZ X-Received: by 2002:a17:902:f0d2:b0:1ca:20a0:7b14 with SMTP id v18-20020a170902f0d200b001ca20a07b14mr234387pla.55.1697656746252; Wed, 18 Oct 2023 12:19:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697656746; cv=none; d=google.com; s=arc-20160816; b=ql/sNOtip4whixu5zqntfmI1oMIp5Bax2iaTxYAcvH7lLrUinTk02J7iVBe5gboBHa 9mDk6TtwyUzhzgazBrF1RbfRjEBXBFyiUrFccIrJD25Phi5il0zYTCjJ+XncvC2fHqkf 3NgmdUeosGtCaaMcoIHRoyvgEqbGq1m3QSut5tznJEB5pMAMIAWjAae9vSh7LZNYmTn2 lCdLpJs7LioS1y8n9blxs5R9iN0YZSvkZ6yO2cRuNaKU+nERmvBpkEPE+z7Y/v0mA2Cu PAKUvZ1VNhJA3FhyqlaL+btp25h4l0lfTw/H9knVbkImSJPfalDpF09nT2wcgFzklSCB 35qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=YSRxwtKFFtcmGHGcUlV8tfK7rLoJNDdNW6F+5SQx19s=; fh=3c3R51DpYDMCxV8+Eura8IwNWt6K/lBXW0vU0qCPE00=; b=UQCbmNrNOcL4rMlcbcaisjXAVbfy+ncUkdpS4tLnPqP6nYnxUBF6nKrY7eNSLma1NF rALwrpmwDRFuhbCMj9oL3wIpGAwXNvcxIQwm3okIJ85BGpSDPCZn83H/GKQqiomYv/Xj TlA0UHJVAI4wkGyS9eSc7BBIg7eiOF2W0VteTnIeUR+y+0d1/6LFkpL0H13spwX/iU6v h/gzHAJMGg33WqbGPMBuU9E1bIkoCSkMY5oA5gyWzsqC4TGm7ogajk023qrJGiiQV5m+ QcWuhJko5NWY9IWYzPQffcH2CShEqww5qKAEWcrv0BR/Q14AoAn+feZVQqY6/rbv372P cwoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SLpSsiiE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id kx14-20020a170902f94e00b001bbf293f45esi463916plb.625.2023.10.18.12.19.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 12:19:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SLpSsiiE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id B466F80D6500; Wed, 18 Oct 2023 12:19:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230491AbjJRTSu (ORCPT + 99 others); Wed, 18 Oct 2023 15:18:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229897AbjJRTSt (ORCPT ); Wed, 18 Oct 2023 15:18:49 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 422F9114 for ; Wed, 18 Oct 2023 12:18:46 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-6b709048f32so3999545b3a.0 for ; Wed, 18 Oct 2023 12:18:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697656726; x=1698261526; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=YSRxwtKFFtcmGHGcUlV8tfK7rLoJNDdNW6F+5SQx19s=; b=SLpSsiiE6PtUP+2zYEQ+zJB5vLxDlP2/hioxa3X9uaBBN1h0bRJuvZ5BIysDhkzFg/ bgrmjR8GAKoYRgCXLxO3vPQwk2oVICNOEtEs/HX/xzFEUUpEcAktUhixRku3M7vKqJyP PeApQqLpMoavgVTjBzTadEQuah4nCZo/LXSTTl4oNOE3fn/MUudTsAvKiyOf72TS/Tv6 /c+fIqlfpjsniP4tipvktCzQ5h4UbeWGi/jbxrFJps1NYmTy5UDzmfOrIuxcs8sQ7/fA KtWWoRSo8VVWiJchV1uTbXJVQk6JTUi+TiSSOLwDfId5MsQVwfBDUuceJCtuALvbZNUP rwpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697656726; x=1698261526; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YSRxwtKFFtcmGHGcUlV8tfK7rLoJNDdNW6F+5SQx19s=; b=qTo3hEi+rkXfaacdRihASFd5dT/wUtA1J7Y8MWhTMZkwy8DKxEe2K23S4vJBzJFMgu UXrs97nxMRa0BDYPwF7eBSi091diQn3vEsjLeNUHUptdvtTEPowTk+okHjtGOBfTo4RD hwWKF5dz+UkWdjjEXhbe0c0kr5+YqfrZ6xmdG8xc5LZDV5xEr2Un09Zpln9G1ZKG66SO A4ANkUNWxYbQTJExDtn0DEMUALFLxKHYJM5KOr+i0bK/xMmnKPKZ96gUiSylQR+NhJKd 9/8tCJZUbiPZOFVfkNcCJEMmSu9aKcuGeiV1GuUoSla35vFLrA5MaWxTdS91j6X2wrYR k+SQ== X-Gm-Message-State: AOJu0YwMc48uuMrG88GsvFhqJqCLY5eKhTZlHY4/IUbDe0NnJ0N4kgeE H5Yr8ZKoTNBSwHOjCxCuz1OJu2FW2Uey3qxD X-Received: by 2002:a05:6a00:21c7:b0:68e:399e:70db with SMTP id t7-20020a056a0021c700b0068e399e70dbmr34377pfj.6.1697656725619; Wed, 18 Oct 2023 12:18:45 -0700 (PDT) Received: from localhost.localdomain ([43.129.178.187]) by smtp.gmail.com with ESMTPSA id x17-20020aa79411000000b00690d4464b95sm3808100pfo.16.2023.10.18.12.18.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 12:18:45 -0700 (PDT) From: Jia Rui To: mark@fasheh.com Cc: jlbec@evilplan.org, joseph.qi@linux.alibaba.com, ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org, Jia Rui Subject: [PATCH] ocfs2: replace BUG_ON() at ocfs2_num_free_extents() with ocfs2_error() Date: Thu, 19 Oct 2023 03:18:11 +0800 Message-Id: <20231018191811.412458-1-jindui71@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 18 Oct 2023 12:19:03 -0700 (PDT) The BUG_ON() at ocfs2_num_free_extents() handles the error that l_tree_deepth of leaf extent block just read form disk is invalid. This error is mostly caused by file system metadata corruption on the disk. There is no need to call BUG_ON() to handle such errors. We can return error code, since the caller can deal with errors from ocfs2_num_free_extents(). Also, we should make the file system read-only to avoid the damage from expanding. Therefore, BUG_ON() is removed and ocfs2_error() is called instead. Signed-off-by: Jia Rui --- fs/ocfs2/alloc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index aef58f1395c8..d6bcf00f6843 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c @@ -967,7 +967,14 @@ int ocfs2_num_free_extents(struct ocfs2_extent_tree *et) el = &eb->h_list; } - BUG_ON(el->l_tree_depth != 0); + if (el->l_tree_depth != 0) { + retval = ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci), + "Owner %llu has leaf extent block %llu with an invalid l_tree_depth of %u\n", + (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci), + (unsigned long long)last_eb_blk, + le16_to_cpu(el->l_tree_depth)); + goto bail; + } retval = le16_to_cpu(el->l_count) - le16_to_cpu(el->l_next_free_rec); bail: -- 2.25.1