Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp699799pxb; Tue, 5 Apr 2022 19:19:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTZtLKzDVEMtqCQrO9RRp9I8j42I0tr97vhFMWf+Nfsdnly4Zbd8ceOykGIvu4qSXPkrvA X-Received: by 2002:a63:f648:0:b0:380:a9f7:2189 with SMTP id u8-20020a63f648000000b00380a9f72189mr5256696pgj.305.1649211557964; Tue, 05 Apr 2022 19:19:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649211557; cv=none; d=google.com; s=arc-20160816; b=zZcxccBi+q1FJQAO4F9Niwpxga2slx81ZhvnuYxzA1KoF0cQFPoK4uFvU2XS32G55i KbTyfGfnVcxYMLlSrYOJ2Qj2o664WHSR5Uug/s+6NJMbQnmQeU7R2/3YZXqPnLScpYYn +T+/bfNMxTEsn+EVSMXzPqjRBi+GBX0JsK4KZ5YqMW3A2DHSNZa4Y/L4DCEm/7eE/CvB ognHDjzgEckIfnlTpnZdjbRWD6SH7QkXsEj5QBKppAuXFt456vWqdqf3HE38gJO6qYpF +bCJT4kpcMsO95z/PiTmYmQXBgLgtyQw24tAgcyLV1fKGu797TuoeUvav+wXMJM7to0r X/MA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tv+7d4C6REUcGBXk8Gn+gTNlPofM/5E/2oRfaR7Wfdw=; b=EL7x3cbN1RY2W5nBhkLyZEmNUrqeebwGtXaHNd9m8C0FPTVz97bXVs7TBvCO0nfJj6 iliuoLrbbothyd3kRMbW9rBoPK0mZxWj3HNk6TX1opCF+S9aiHPumrU5Rxd7Kq7Xm3KV VMj2txIl/bs1Yo+LpIyG64XGag7/Z/W1Wxk0N+2TLqjnxfwt3jZowBAupQpgysbFATAf IRXb3kSOAPoEczoyEfyyl+4eILEMepFKtbtlLLQxgcT45WCo19GArLpzsbfryJg4BrVA YhGBc3JDqrimAXgGNJreBm88M03snCW35qIKhpcNVxtYBsgzc0z4dBJCpg1xTVPz6A72 6wIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2DTllwcm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q12-20020a170902f78c00b00153be606662si13421701pln.419.2022.04.05.19.19.01; Tue, 05 Apr 2022 19:19:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2DTllwcm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1388301AbiDENVv (ORCPT + 99 others); Tue, 5 Apr 2022 09:21:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344696AbiDEJVG (ORCPT ); Tue, 5 Apr 2022 05:21:06 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 361AE237FF; Tue, 5 Apr 2022 02:08:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0595E61564; Tue, 5 Apr 2022 09:08:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15436C385A0; Tue, 5 Apr 2022 09:08:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649149707; bh=VlcoB2NN9O2FYLHqTNDYV/Vv3oVh0iUwfatCynBEVBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2DTllwcm/mbT6THd2gdgdlvHDDs7t12EspTP7Z1s6Hz0aMkWQ45EXkZYzHLER17Gv 2cFMmWJfX705lh/wE20hud0f9aHx8vIwT84elETAmQqGIDjab5mp7WzCZqyNo/wPJ8 xJRhWV76EgBacvvBE30CDx0I1jP/QhBFavsUxKjs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Boris Burkov , Johannes Thumshirn , Josef Bacik , David Sterba , Sasha Levin Subject: [PATCH 5.16 0795/1017] btrfs: make search_csum_tree return 0 if we get -EFBIG Date: Tue, 5 Apr 2022 09:28:28 +0200 Message-Id: <20220405070417.849784472@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070354.155796697@linuxfoundation.org> References: <20220405070354.155796697@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Josef Bacik [ Upstream commit 03ddb19d2ea745228879b9334f3b550c88acb10a ] We can either fail to find a csum entry at all and return -ENOENT, or we can find a range that is close, but return -EFBIG. In essence these both mean the same thing when we are doing a lookup for a csum in an existing range, we didn't find a csum. We want to treat both of these errors the same way, complain loudly that there wasn't a csum. This currently happens anyway because we do count = search_csum_tree(); if (count <= 0) { // reloc and error handling } However it forces us to incorrectly treat EIO or ENOMEM errors as on disk corruption. Fix this by returning 0 if we get either -ENOENT or -EFBIG from btrfs_lookup_csum() so we can do proper error handling. Reviewed-by: Boris Burkov Reviewed-by: Johannes Thumshirn Signed-off-by: Josef Bacik Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/file-item.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index d1cbb64a78f3..91ae1caa1bdb 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c @@ -303,7 +303,7 @@ static int search_csum_tree(struct btrfs_fs_info *fs_info, read_extent_buffer(path->nodes[0], dst, (unsigned long)item, ret * csum_size); out: - if (ret == -ENOENT) + if (ret == -ENOENT || ret == -EFBIG) ret = 0; return ret; } -- 2.34.1