Message ID | aeedf174df718917ea2e17eb9fae1b68baf09d96.1607349282.git.josef@toxicpanda.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-btrfs-owner@kernel.org> 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 74E7EC4361B for <linux-btrfs@archiver.kernel.org>; Mon, 7 Dec 2020 13:58:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3016423444 for <linux-btrfs@archiver.kernel.org>; Mon, 7 Dec 2020 13:58:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726645AbgLGN6f (ORCPT <rfc822;linux-btrfs@archiver.kernel.org>); Mon, 7 Dec 2020 08:58:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726234AbgLGN6e (ORCPT <rfc822;linux-btrfs@vger.kernel.org>); Mon, 7 Dec 2020 08:58:34 -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 77A9CC0613D2 for <linux-btrfs@vger.kernel.org>; Mon, 7 Dec 2020 05:57:54 -0800 (PST) Received: by mail-qt1-x843.google.com with SMTP id y15so1810836qtv.5 for <linux-btrfs@vger.kernel.org>; Mon, 07 Dec 2020 05:57: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=3MBAVyNUqf/0LMFLeiGY+TpoYSaKveLLXpRtIg0JpiI=; b=EV92knrOXBO2m9th5ksezneX5ciPg8ZI+lHr1VDedSkKyznu6Qj1UCiFvcDaVBbMc8 mXdwoyCvxaVlN2UOOgrfZ/QRp0SksockmGLivSgsPgc8wuzcq83ilJAX7Z0LgbD0flLh fm0/TKV+4R1pMr7/9tN3rdBuhYL18NC7k6NIcRRM0y1AQ6TTfH7/J4I5Uz2ud0azD93B OeiVxoCJsFdHD0S6flBu2JUnp0nCbLSkj9HNE4Tc5evwMsON7EegEzHKpDXSphgO4lGK DP4mJRCdcr8+/vCfE/XIMALZ4bUMjlOVVgkn//dxMscA6WJU5IZa1J6BPFPKN3A29wV2 6MCg== 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=3MBAVyNUqf/0LMFLeiGY+TpoYSaKveLLXpRtIg0JpiI=; b=AdIS+PLrbM0iaba7HXyajbCbl+3OfTHBUGyWw8zJyp8gZtLrlJkG48idy0ob3bukj2 Ll7+1704BtNUCg9HH968bsRjODu/ti6yDFohWsRCDA+45WPB9ien1TSIK0KTrPh+YdNy YApE0px8KiqFaPCm3g/aV7S5folxrxH40CUkKZqxLsUgqmkzH/ORXx8eYWT75VPHjjVK taWnCUV1fF4SQZro36hUbIx/sjs0733eHw6NnX4hFF48OZtiKKsMMZ+nJqiap5NDO7C6 f8n2Cc3KucJipR+T1NhKCr1sU0IvtKfrpO/fS0hGaG+p01A+DM9XijzloaGESd7ePhRm s6rA== X-Gm-Message-State: AOAM533xX4Kw6FcFhOcV+3FyPIY3JJRXADCErg8Dl8yRx9CWkocskRYJ 1Ow6r8NRqohMCQpw/SUimyljNbwrr3D18GhO X-Google-Smtp-Source: ABdhPJxNdrlSVboX+wtnPlU9BLcJrxzV4X8EYXLmla9RsIlDLRvW+y2AMASS5SBaDF46nkDXSc7TjQ== X-Received: by 2002:ac8:6910:: with SMTP id e16mr1464031qtr.329.1607349473306; Mon, 07 Dec 2020 05:57: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 t205sm12507707qke.35.2020.12.07.05.57.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 05:57:52 -0800 (PST) From: Josef Bacik <josef@toxicpanda.com> To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Cc: Qu Wenruo <wqu@suse.com>, Johannes Thumshirn <johannes.thumshirn@wdc.com> Subject: [PATCH v5 03/52] btrfs: fix lockdep splat in btrfs_recover_relocation Date: Mon, 7 Dec 2020 08:56:55 -0500 Message-Id: <aeedf174df718917ea2e17eb9fae1b68baf09d96.1607349282.git.josef@toxicpanda.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <cover.1607349281.git.josef@toxicpanda.com> References: <cover.1607349281.git.josef@toxicpanda.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <linux-btrfs.vger.kernel.org> X-Mailing-List: linux-btrfs@vger.kernel.org |
Series |
Cleanup error handling in relocation
|
expand
|
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 7930e1c78c45..49ba941f0314 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -4318,6 +4318,8 @@ int btrfs_recover_balance(struct btrfs_fs_info *fs_info) btrfs_warn(fs_info, "balance: cannot set exclusive op status, resume manually"); + btrfs_release_path(path); + mutex_lock(&fs_info->balance_mutex); BUG_ON(fs_info->balance_ctl); spin_lock(&fs_info->balance_lock);