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=-6.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 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 714A3C35250 for ; Sun, 9 Feb 2020 12:59:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4605820733 for ; Sun, 9 Feb 2020 12:59:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581253155; bh=s2lgEgl0u5I0sEZ8bhJwft13YzD3TaXmHHE/AalyTkc=; h=Subject:To:Cc:From:Date:List-ID:From; b=a5ai9779f3f7Bp7ej2pKM6sYLuXZPn7wTGbZwEYDOWycx9pwWSYK1ihRibdKkX2hB Tvm0OboxNu3JIB1nrtlMuR/4mL9TH5CwWOKVSbJnR6icL+EkN96U7KAAHGR5kBbsiU AM4DPoUFxMNLCcFavhTtXGP7LokIOwvnUsHNIMh8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727721AbgBIM7O (ORCPT ); Sun, 9 Feb 2020 07:59:14 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:36811 "EHLO out5-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727340AbgBIM7O (ORCPT ); Sun, 9 Feb 2020 07:59:14 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 8E8FF21AA4; Sun, 9 Feb 2020 07:59:13 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Sun, 09 Feb 2020 07:59:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=r7BBuk 4uCDjUlKhip3pu8vKt4cSA4JwjczVzNqone3s=; b=vgcb3bCx6bTCKhHAZKBIIY nHqlDgYaKMj0+SDIIcMbLl3DAwR3V+NABSAzYkE5VyX/wk2HV3FdfYWNw0nGT52Y 3BvHUvZJ2JEi7PUB/iuNuohyhyrOg+JVSz1LcF8kspe0fixUc4IZGWVESLphdvtU jiAprco846TTvRVKadIaS3Gq/yHuyzL+pgDTHOQWcxGXiA7r2Rx+7alB1LGsIQ8S EEVK8w6F1ua9IBh8mR26WhAluZsGd0OtF84fa4yr4964tFSVcbJr4ZEMQIEt363K WUGFUygd0kbIZzHxQfZbe/O6tRVnNPOD7I2PTO9FF8EXTX26PIOlJ1Fp0Tw0AjkQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrheelgddvfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepuffvhfffkfggtgfgsehtkeertddttd flnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhg qeenucfkphepfeekrdelkedrfeejrddufeehnecuvehluhhsthgvrhfuihiivgepjeenuc frrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghhrdgtohhm X-ME-Proxy: Received: from localhost (unknown [38.98.37.135]) by mail.messagingengine.com (Postfix) with ESMTPA id 96B7E3280059; Sun, 9 Feb 2020 07:59:10 -0500 (EST) Subject: FAILED: patch "[PATCH] btrfs: free block groups after free'ing fs trees" failed to apply to 5.4-stable tree To: josef@toxicpanda.com, dsterba@suse.com Cc: From: Date: Sun, 09 Feb 2020 12:30:41 +0100 Message-ID: <1581247841121239@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 4e19443da1941050b346f8fc4c368aa68413bc88 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Tue, 21 Jan 2020 09:17:06 -0500 Subject: [PATCH] btrfs: free block groups after free'ing fs trees 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 diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 5ce2801f8388..aea48d6ddc0c 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -4030,11 +4030,18 @@ void __cold close_ctree(struct btrfs_fs_info *fs_info) invalidate_inode_pages2(fs_info->btree_inode->i_mapping); btrfs_stop_all_workers(fs_info); - btrfs_free_block_groups(fs_info); - 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