Message ID | 1bcdd646be881f16be39bc597e6f273c1ccb5a60.1607019557.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 1945EC193FE for <linux-btrfs@archiver.kernel.org>; Thu, 3 Dec 2020 18:25:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D2E6F2085B for <linux-btrfs@archiver.kernel.org>; Thu, 3 Dec 2020 18:25:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502083AbgLCSZ2 (ORCPT <rfc822;linux-btrfs@archiver.kernel.org>); Thu, 3 Dec 2020 13:25:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2502077AbgLCSZ0 (ORCPT <rfc822;linux-btrfs@vger.kernel.org>); Thu, 3 Dec 2020 13:25:26 -0500 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AE38C08E861 for <linux-btrfs@vger.kernel.org>; Thu, 3 Dec 2020 10:24:34 -0800 (PST) Received: by mail-qk1-x741.google.com with SMTP id y197so3009498qkb.7 for <linux-btrfs@vger.kernel.org>; Thu, 03 Dec 2020 10:24:34 -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=7YyqnduuKqEUVKiAG3eGPq7ah87Sv4iF9G8iHqvfpig=; b=2BGNW/4OxS+zX+tjUwBXvKBfW1kNWv681mFOhEEQ2iasQ3xAZVcQojTMB3r8VHQDaD C5pbHGS5SB4fDZzVLXAKojhIPEtwvJkwF/ROXevRDg+KqJBYWPXD8c8G3UuOVWELoLnw 99pCtpaxOo6yitrCtoLKFQvG7FAepjNfKVscUcohpFzpiy9/PDwradEW/6DSXMrnRsZh WotoQ+gK9KSeZwfgv0DgbXmqZA2wn+dLx5NzXTtF8wR62983+r4xBjawa6Hn0fQg+WNL FUqZ21jvWtYdA3S/licF+4OYyOxUEULytf1MwTQa6QyfIRTvU6JPeU4oKVNo1d2eltYh IsPw== 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=7YyqnduuKqEUVKiAG3eGPq7ah87Sv4iF9G8iHqvfpig=; b=BflmufIpgOZ12gzGp1OclLDUwU6DdHggsrSgFQzz5VzkmEoUNPfWsX+uOFmMfsPUVQ 5/R03QiysnySgEh0BQOFis2rhZdfMTvvpSAGzl44DsQgErNZICRBOfBx6JYgj0gTI4E2 Mj5MXoGYNCZe5TSRUBWJixj3ssEo47KDzvO49RzZ9MmKFqgLF9qX6EP8o3dwAOwSpqFl vgizpi6Vmy+vcqnoYKZY3SFf3l1awP2updNkCACAHhzBFn2MT0JBAzcqmkUn/yDryMzB WqyB4O53JogvbZdtghDRdfZwh5b5CXYW7FInpoVm+U9vvk43DHdeexmWpB0LXd7h7JfD FnEA== X-Gm-Message-State: AOAM532Vt7Fredy/aBu+Kyl5j3QNn17n8qxZyMac79fWAh+E0O+Twg1q N3o9nulvbG8oW190ggOUjOgkVJA7+JirNBDz X-Google-Smtp-Source: ABdhPJyH8yDiYr1UvNgucPRh0Dy84uFVBOJOEgkzh+RD27rF7vys/UEkrAVK6szX8Y+gU19t6EPaZw== X-Received: by 2002:a05:620a:22e7:: with SMTP id p7mr4213472qki.333.1607019873454; Thu, 03 Dec 2020 10:24:33 -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 x21sm2147569qtb.14.2020.12.03.10.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Dec 2020 10:24:32 -0800 (PST) From: Josef Bacik <josef@toxicpanda.com> To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Cc: Qu Wenruo <wqu@suse.com> Subject: [PATCH v4 53/53] btrfs: splice remaining dirty_bg's onto the transaction dirty bg list Date: Thu, 3 Dec 2020 13:22:59 -0500 Message-Id: <1bcdd646be881f16be39bc597e6f273c1ccb5a60.1607019557.git.josef@toxicpanda.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <cover.1607019557.git.josef@toxicpanda.com> References: <cover.1607019557.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/block-group.c b/fs/btrfs/block-group.c index 0886e81e5540..5cfa52b1a3b8 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -2685,6 +2685,9 @@ int btrfs_start_dirty_block_groups(struct btrfs_trans_handle *trans) } spin_unlock(&cur_trans->dirty_bgs_lock); } else if (ret < 0) { + spin_lock(&cur_trans->dirty_bgs_lock); + list_splice_init(&dirty, &cur_trans->dirty_bgs); + spin_unlock(&cur_trans->dirty_bgs_lock); btrfs_cleanup_dirty_bgs(cur_trans, fs_info); }