From patchwork Mon Dec 7 13:57:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 11956003 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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 39C3DC4361B for ; Mon, 7 Dec 2020 13:59:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED43B23444 for ; Mon, 7 Dec 2020 13:59:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727018AbgLGN7w (ORCPT ); Mon, 7 Dec 2020 08:59:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727011AbgLGN7w (ORCPT ); Mon, 7 Dec 2020 08:59:52 -0500 Received: from mail-qv1-xf41.google.com (mail-qv1-xf41.google.com [IPv6:2607:f8b0:4864:20::f41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 237C4C09424E for ; Mon, 7 Dec 2020 05:58:56 -0800 (PST) Received: by mail-qv1-xf41.google.com with SMTP id l7so1140313qvt.4 for ; Mon, 07 Dec 2020 05:58:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hZ3N5Xz5HqHBUZlvTRm0YcZnf8FPKOJb+gKET8jp7xc=; b=oDoHiLCv0aEMGGp8MoOcAccLlgkftPvhWIPRmBXzXjcOenLAx9Q9LCwrwcdeOpuwTL n+5evArLDrMtOWrrxhC5tDbjRcOPrcJrysbiX2z24mmxOXKYeYN9X5vKRwencGzEIvqk R6hMmlKGn1U4KyO1v9r1MX93ZiRnmRo+smlkHp/qmWIKnN+CaKjpKelG/xtOwL5Irky6 2TafG94ZXSqU6Tp9RZRjw9vr2ZHdJM24U80VMmO9KIiJHmlgcx7yU99DXdmN4DXwZnNa Tb/cyG4KYYa3Ep0IrwKk2Hs8Byd0+jebQ6BIFQX0Nwy9RsUpUdO9e0NpA1FqsFzLGwyn Nmow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hZ3N5Xz5HqHBUZlvTRm0YcZnf8FPKOJb+gKET8jp7xc=; b=hB+V9BmqBdC2ey6NTH5DB/pSbhuZP4MjqscZLQyFZGDwEQbrUILv7m/QgtiOvm+DrI wWxXRr06w0+pYQelAhHepRm+G3YQdZUbwNPc0N9wve7wtW1SGM3kI8TQZm6X/SLnhtk3 EjqZ7TYZttsNq5XDQDwkYnSAxnwND3aMOXr5zX3isAHXRG6vhYws+0u/F7ixV1asaetN 5druAy1VW35VtUFIxh8PEKUwJhS5tSrzGn7KZ3LQ1ts5RjG+ot+Co+bkmmHW5M19Mm9O c6wpDSQKKECQjexGsyrMuv5BFUFo6yRrYljyhcKXdl7LXxchfO2AWDTLqYAArz5oLAHb dh/Q== X-Gm-Message-State: AOAM532r2go2SlznBjr9Ot4FF30ksidVSP1Or2lAlaaEKKf9qWxICTVT Fe4XSwtMKrHYWpNtwYuFVEaxs9Q6FekvSiiE X-Google-Smtp-Source: ABdhPJwSpEfGL7h5HlPfAyiva7Ej3GR2ECCHGdkfD4BldUFlhZeEeWkOIM0NvzZLCGhdHWZJy681Gg== X-Received: by 2002:ad4:5687:: with SMTP id bc7mr21476988qvb.61.1607349534973; Mon, 07 Dec 2020 05:58:54 -0800 (PST) Received: from localhost (cpe-174-109-172-136.nc.res.rr.com. [174.109.172.136]) by smtp.gmail.com with ESMTPSA id q73sm3940028qke.16.2020.12.07.05.58.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 05:58:53 -0800 (PST) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Cc: Qu Wenruo Subject: [PATCH v5 35/52] btrfs: do proper error handling in btrfs_update_reloc_root Date: Mon, 7 Dec 2020 08:57:27 -0500 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org We call btrfs_update_root in btrfs_update_reloc_root, which can fail for all sorts of reasons, including IO errors. Instead of panicing the box lets return the error, now that all callers properly handle those errors. Reviewed-by: Qu Wenruo Signed-off-by: Josef Bacik --- fs/btrfs/relocation.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index b4ced3a0ca6f..ee175d2a5abe 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -894,7 +894,7 @@ int btrfs_update_reloc_root(struct btrfs_trans_handle *trans, int ret; if (!have_reloc_root(root)) - goto out; + return 0; reloc_root = root->reloc_root; root_item = &reloc_root->root_item; @@ -927,10 +927,8 @@ int btrfs_update_reloc_root(struct btrfs_trans_handle *trans, ret = btrfs_update_root(trans, fs_info->tree_root, &reloc_root->root_key, root_item); - BUG_ON(ret); btrfs_put_root(reloc_root); -out: - return 0; + return ret; } /*