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,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 D9EDCC52D48 for ; Thu, 27 Feb 2020 14:05:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A820824656 for ; Thu, 27 Feb 2020 14:05:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582812341; bh=yDzqG4pPlZs9Zk75bJtsnY+OkC14/CaUT/c2CRXU15M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=g8RCygi5TFwefOaWdXVBGeIRTlqHLouuvcbxv3uRfVyppTfodAFnx/QAgWOrhrX+0 pWELTSwR5vBiGm+D8qssVJpi2ZmBRBtL7+54VdtzRQWbUYjWsjYFbW8HaDHY398tPF wLLQ8Ce7ly3QbV40xJbeCufJWKSjEIV4fUBnK0JY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733205AbgB0OFk (ORCPT ); Thu, 27 Feb 2020 09:05:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:42384 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730251AbgB0OFi (ORCPT ); Thu, 27 Feb 2020 09:05:38 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 E689721D7E; Thu, 27 Feb 2020 14:05:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582812337; bh=yDzqG4pPlZs9Zk75bJtsnY+OkC14/CaUT/c2CRXU15M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hdArgIktWWFA6Frw62InJB2SPV5xKBYKHYduNMVlw94P3h3bJSarOUKqCkiFlN1Uu VVl0mRElORR7ffFzycouR8a+6128osSroKPdKSUsgH8uGPluJoSeTwaRuzD8Y/Ec/N V8PS7bNhiNWOdE/DslZbYNEblEb6fL2Nu/2u7L2w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Thumshirn , Nikolay Borisov , Qu Wenruo , Josef Bacik , David Sterba Subject: [PATCH 4.19 77/97] btrfs: do not check delayed items are empty for single transaction cleanup Date: Thu, 27 Feb 2020 14:37:25 +0100 Message-Id: <20200227132227.055421594@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132214.553656188@linuxfoundation.org> References: <20200227132214.553656188@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Josef Bacik commit 1e90315149f3fe148e114a5de86f0196d1c21fa5 upstream. btrfs_assert_delayed_root_empty() will check if the delayed root is completely empty, but this is a filesystem-wide check. On cleanup we may have allowed other transactions to begin, for whatever reason, and thus the delayed root is not empty. So remove this check from cleanup_one_transation(). This however can stay in btrfs_cleanup_transaction(), because it checks only after all of the transactions have been properly cleaned up, and thus is valid. CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Johannes Thumshirn Reviewed-by: Nikolay Borisov Reviewed-by: Qu Wenruo Signed-off-by: Josef Bacik Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/disk-io.c | 1 - 1 file changed, 1 deletion(-) --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -4469,7 +4469,6 @@ void btrfs_cleanup_one_transaction(struc wake_up(&fs_info->transaction_wait); btrfs_destroy_delayed_inodes(fs_info); - btrfs_assert_delayed_root_empty(fs_info); btrfs_destroy_marked_extents(fs_info, &cur_trans->dirty_pages, EXTENT_DIRTY);