From patchwork Tue Dec 8 16:23:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 11958933 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 538D6C19437 for ; Tue, 8 Dec 2020 16:26:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2D17123AFA for ; Tue, 8 Dec 2020 16:26:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730381AbgLHQZp (ORCPT ); Tue, 8 Dec 2020 11:25:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730371AbgLHQZp (ORCPT ); Tue, 8 Dec 2020 11:25:45 -0500 Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46F89C06179C for ; Tue, 8 Dec 2020 08:24:54 -0800 (PST) Received: by mail-qt1-x843.google.com with SMTP id z3so12284334qtw.9 for ; Tue, 08 Dec 2020 08:24:54 -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=RU1H8MQ+4NOfYfTiKPHWw/9l/yKpcFXfnObQ5jomNVc=; b=fsY1JJw+3Y0QbN3Bp0UekzCaoulXnQ1bX7pd3FqguTL2hZOD9jFsZ9TUDLPp1zqm8y mTtZnHT1l+ZRkB0iv3wNyWQb3zpPETNl1gfJNkMzccNb4/PhJ8LzmP0E0cAJgfHs01Td etHeroSLbC1N7b81EQoDuhHNk405G0K0Hw11q2SHq+eI5SoVajNBM4WMYARM7QVIZlH4 PatgLGnlm1s2HukjGL5imzr2Qwpu9O/EsDpDRodt449fBo5yeRCWgv/QnQtKzIisW2KS n8cAPg0flgCcPWOSBCLS6dB/990MvqUdYPuiy2l+wrkLJpsAywRKItLHiB61a7KDtzuQ b6bQ== 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=RU1H8MQ+4NOfYfTiKPHWw/9l/yKpcFXfnObQ5jomNVc=; b=TiNuvY3LIK49j84fAPyd5FfTRbLfsNaQor6z+fLRx6pPG7bMqanlFywSXGA6TxY7f2 /dH+BwirAOlhSBe6YoE0LB7Sv8KJS+jhCC8IYj0oF6VEYuMqMQeRXIZtZqy0waJHaywH 2Wl+9yVaudviCCOgJfuhkMSMnH9SQjSbE8WwF51J/eEM+sqlnXZM2uyw3KY7d6xawPxs eB9nkIggswB0EWKoGOhvhGlCqugIiE+J/HF/5891Mw8sG7WvzSOXBMEXGS1ks+UOD+in ST/e/hns6HSOgCT8QFSPR4u61cqKcKHGyNcb+Nt97uuJzt0gG+snypyqi7fj8fFljJXj nVIg== X-Gm-Message-State: AOAM530s1GC1YzHh9R5DcafX3aQeG4BqJHTNw5aRCjljmMSgUuujAzBJ IMg/F5GdeIN5UJOb09uC6KCYLPKNOzHUpZM4 X-Google-Smtp-Source: ABdhPJxz4lf6CaXy1EgcJ4dpMJOWSDXyBq6vmPdYZxBNmMgWBIjdZVVQ4zQKQoGt2n4s452QDmLCIg== X-Received: by 2002:ac8:6651:: with SMTP id j17mr31110744qtp.176.1607444693224; Tue, 08 Dec 2020 08:24:53 -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 70sm4013173qkk.10.2020.12.08.08.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 08:24:52 -0800 (PST) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Cc: Qu Wenruo Subject: [PATCH v6 23/52] btrfs: handle btrfs_record_root_in_trans failure in start_transaction Date: Tue, 8 Dec 2020 11:23:30 -0500 Message-Id: <90766a86c5e5ac96c9494d2f3e8a149fd4719dc4.1607444471.git.josef@toxicpanda.com> 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 btrfs_record_root_in_trans will return errors in the future, so handle the error properly in start_transaction. Reviewed-by: Qu Wenruo Signed-off-by: Josef Bacik --- fs/btrfs/transaction.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 5cc368fede19..df9b9c1a8831 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -734,7 +734,11 @@ start_transaction(struct btrfs_root *root, unsigned int num_items, * Thus it need to be called after current->journal_info initialized, * or we can deadlock. */ - btrfs_record_root_in_trans(h, root); + ret = btrfs_record_root_in_trans(h, root); + if (ret) { + btrfs_end_transaction(h); + return ERR_PTR(ret); + } return h;