From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 34456C3B18B for ; Thu, 13 Feb 2020 15:24:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 023232469A for ; Thu, 13 Feb 2020 15:24:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607457; bh=XGihjVxIgskibkVAWS3CfHIBjo058JMWp6934itqryo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pB516WB1N1mQLpCVJ9qQ3ltYzo8d7OyClgc+jb01sFQs5OykB0QrM7aRd9VWZI5Dt RphTiT7fudp6pS4DPsgTI/YA8CCKNfVDZQBFGhPB+G6Q/jgYoWduW29zOz+pyUQg4o QAvLf6HCJySoqI5pOpJHUeeTMbcWtxlB3PCT1ua8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728111AbgBMPYP (ORCPT ); Thu, 13 Feb 2020 10:24:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:37116 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728639AbgBMPYP (ORCPT ); Thu, 13 Feb 2020 10:24:15 -0500 Received: from localhost (unknown [104.132.1.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5970C24689; Thu, 13 Feb 2020 15:24:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581607454; bh=XGihjVxIgskibkVAWS3CfHIBjo058JMWp6934itqryo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DNx5HrrIL06+b9Xhw7SjZhZFUx5aiE/f4+47DvxxVFpKQR4u7+zcoCFAsC2ADe5uE UJy9h2j4m/l9c7DWe+ixMSrNwbTo81km/U3NSVxwwDwGilPPl9QrPwmT17dSLcaD2c 0FrYF3cAo98xeV17q9mWcKcD4Vn6bjM281Hnrqr8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Josef Bacik , David Sterba , Sasha Levin Subject: [PATCH 4.9 083/116] btrfs: free block groups after freeing fs trees Date: Thu, 13 Feb 2020 07:20:27 -0800 Message-Id: <20200213151915.106400155@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200213151842.259660170@linuxfoundation.org> References: <20200213151842.259660170@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Josef Bacik [ Upstream commit 4e19443da1941050b346f8fc4c368aa68413bc88 ] Sometimes when running generic/475 we would trip the WARN_ON(cache->reserved) check when free'ing the block groups on umount. This is because sometimes we don't commit the transaction because of IO errors and thus do not cleanup the tree logs until at umount time. These blocks are still reserved until they are cleaned up, but they aren't cleaned up until _after_ we do the free block groups work. Fix this by moving the free after free'ing the fs roots, that way all of the tree logs are cleaned up and we have a properly cleaned fs. A bunch of loops of generic/475 confirmed this fixes the problem. CC: stable@vger.kernel.org # 4.9+ Signed-off-by: Josef Bacik Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/disk-io.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index eab5a9065f093..439b5f5dc3274 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3864,6 +3864,15 @@ void close_ctree(struct btrfs_root *root) clear_bit(BTRFS_FS_OPEN, &fs_info->flags); free_root_pointers(fs_info, true); + /* + * We must free the block groups after dropping the fs_roots as we could + * have had an IO error and have left over tree log blocks that aren't + * cleaned up until the fs roots are freed. This makes the block group + * accounting appear to be wrong because there's pending reserved bytes, + * so make sure we do the block group cleanup afterwards. + */ + btrfs_free_block_groups(fs_info); + iput(fs_info->btree_inode); #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY -- 2.20.1