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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFDD5C433DF for ; Mon, 18 May 2020 11:15:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B36F92084C for ; Mon, 18 May 2020 11:15:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589800512; bh=Akqbndr75LaEW0M3DBNI+KTbH8yvVBmKDrh573VcEYE=; h=From:To:Subject:Date:List-ID:From; b=1XiQ6Lg7wzIDjwr3C2kB8oZsQRlMdOfqtmyTklUAm0mHkCUPrYIsbqrUlEqYsoBpl 797lYeZ8ZH95padKxXvqWAcVtk7BZt9ee94P4XiXVERkXV9hqc+SvAHBdCFlcQ3bNI nHO05pijtBF4oafuW/Q8uczmcdks8KKU7JFm3FVg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727005AbgERLPM (ORCPT ); Mon, 18 May 2020 07:15:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:38360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726726AbgERLPL (ORCPT ); Mon, 18 May 2020 07:15:11 -0400 Received: from debian6.Home (bl8-197-74.dsl.telepac.pt [85.241.197.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0F5952083E for ; Mon, 18 May 2020 11:15:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589800511; bh=Akqbndr75LaEW0M3DBNI+KTbH8yvVBmKDrh573VcEYE=; h=From:To:Subject:Date:From; b=zL4NfIHXF7mFsTeF/LA8P+O0FFr1+TtJNDbpv8Pqu1WAZiR072HNGUaf/JCsR4lW1 WgoNNi6PWl/0XLZU/k9cUNqOV8Pch0r7roE7u21poAFNVhIYLUP39OTMmUDYv6vyx+ RS3wguNfTCzkmv9qTUKC4J/Sf0Xe3I1cKkugr6L8= From: fdmanana@kernel.org To: linux-btrfs@vger.kernel.org Subject: [PATCH 3/4] Btrfs: do not ignore error from btrfs_next_leaf() when inserting checksums Date: Mon, 18 May 2020 12:15:09 +0100 Message-Id: <20200518111509.12935-1-fdmanana@kernel.org> X-Mailer: git-send-email 2.11.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Filipe Manana We are currently treating any non-zero return value from btrfs_next_leaf() the same way, by going to the code that inserts a new checksum item in the tree. However if btrfs_next_leaf() returns an error (a value < 0), we should just stop and return the error, and not behave as if nothing has happened, since in that case we do not have a way to know if there is a next leaf or we are currently at the last leaf already. So fix that by returning the error from btrfs_next_leaf(). Signed-off-by: Filipe Manana --- fs/btrfs/file-item.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index 104858e2a836..4f563469c97a 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c @@ -887,10 +887,12 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans, nritems = btrfs_header_nritems(path->nodes[0]); if (!nritems || (path->slots[0] >= nritems - 1)) { ret = btrfs_next_leaf(root, path); - if (ret == 1) + if (ret < 0) { + goto out; + } else if (ret > 0) { found_next = 1; - if (ret != 0) goto insert; + } slot = path->slots[0]; } btrfs_item_key_to_cpu(path->nodes[0], &found_key, slot); -- 2.11.0