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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9968E95A86 for ; Sun, 8 Oct 2023 00:53:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344271AbjJHAxY (ORCPT ); Sat, 7 Oct 2023 20:53:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234453AbjJHAxH (ORCPT ); Sat, 7 Oct 2023 20:53:07 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 527BF19A1; Sat, 7 Oct 2023 17:49:57 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69C5FC433D9; Sun, 8 Oct 2023 00:49:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696726197; bh=L159qudJc+Akc90axzG+3W7IDFXrHMEjOlzCUPP83Tk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AIy8SaiSc+oIrEI31Nm2BnrFLpAkJWN5zZpv7aEvwsEZJv8tTbj+CctrylzuS6L+f ma3nbDdTU3moXu+OsLbJol9dGt4kPkqaL0oFcW/vaxN4P1KFWeuUCmwyGIMHVL36tN KHVo9GRB5TkXdQIk8dKZKokdjTJnjvro1YoexRixzebBAlSQPR3JW89WmLdjWlW+v2 QiS0m6GKfMf/3Kb780wyciQPQF0R4yKz02uTav+pkPhJCpyqXkERDqRiM1pkXvETur i2gJKyTKJFWQEDKjjzaJDZKAY43yeZdIhat7IY/nbutSyq06hZayRm/2hgb9fE591H BaYOGa9hQojWw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Filipe Manana , Josef Bacik , David Sterba , Sasha Levin , clm@fb.com, linux-btrfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 03/10] btrfs: return -EUCLEAN for delayed tree ref with a ref count not equals to 1 Date: Sat, 7 Oct 2023 20:49:42 -0400 Message-Id: <20231008004950.3768189-3-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231008004950.3768189-1-sashal@kernel.org> References: <20231008004950.3768189-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.134 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Filipe Manana [ Upstream commit 1bf76df3fee56d6637718e267f7c34ed70d0c7dc ] When running a delayed tree reference, if we find a ref count different from 1, we return -EIO. This isn't an IO error, as it indicates either a bug in the delayed refs code or a memory corruption, so change the error code from -EIO to -EUCLEAN. Also tag the branch as 'unlikely' as this is not expected to ever happen, and change the error message to print the tree block's bytenr without the parenthesis (and there was a missing space between the 'block' word and the opening parenthesis), for consistency as that's the style we used everywhere else. Reviewed-by: Josef Bacik Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/extent-tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 48f2de789b755..a19bdb3597405 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -1674,12 +1674,12 @@ static int run_delayed_tree_ref(struct btrfs_trans_handle *trans, parent = ref->parent; ref_root = ref->root; - if (node->ref_mod != 1) { + if (unlikely(node->ref_mod != 1)) { btrfs_err(trans->fs_info, - "btree block(%llu) has %d references rather than 1: action %d ref_root %llu parent %llu", + "btree block %llu has %d references rather than 1: action %d ref_root %llu parent %llu", node->bytenr, node->ref_mod, node->action, ref_root, parent); - return -EIO; + return -EUCLEAN; } if (node->action == BTRFS_ADD_DELAYED_REF && insert_reserved) { BUG_ON(!extent_op || !extent_op->update_flags); -- 2.40.1