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,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 EC078C432C0 for ; Tue, 3 Dec 2019 22:50:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 051EE21556 for ; Tue, 3 Dec 2019 22:50:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413427; bh=n7bbc5CvXmVJKbMZHCqQRLTFZI8HbEAAyJkp28oPY4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hG89+d4Oerg0KptNUkRhWA4wUzyFt8DhE+5/LijJk+WR09GMys1Gj1zWSW3eQTzd3 viLdL+vI3fcv7qtRyIkZUYwaw/liTCXXP3xPRBsfrGCnAV4gF50fOl7bBn55Agwo05 hDriALfJXtsf2teo0+q1PbpU1EUyljDnscvdPiq4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728794AbfLCWuZ (ORCPT ); Tue, 3 Dec 2019 17:50:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:41990 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729065AbfLCWuY (ORCPT ); Tue, 3 Dec 2019 17:50:24 -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 9315B2080F; Tue, 3 Dec 2019 22:50:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413424; bh=n7bbc5CvXmVJKbMZHCqQRLTFZI8HbEAAyJkp28oPY4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H/3pqlkM8xWaNe4xe5bMqRfrOsCXdZOhWR9M/vOYHhKkC6KDpqjzkTy+dAsF2E+Ty 3HHr89GuOpB8t+fZciKWO99Q7NMLyzvnTRjH1h3rR6gPcNpE5F11WZ3g7cbyUPfNiX 3pCjqLe2CHLGDk13VuDYwFrrgkoX+lA5ZIuReV68= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nikolay Borisov , Josef Bacik , David Sterba , Sasha Levin Subject: [PATCH 4.19 121/321] btrfs: only track ref_heads in delayed_ref_updates Date: Tue, 3 Dec 2019 23:33:07 +0100 Message-Id: <20191203223433.451314810@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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 158ffa364bf723fa1ef128060646d23dc3942994 ] We use this number to figure out how many delayed refs to run, but __btrfs_run_delayed_refs really only checks every time we need a new delayed ref head, so we always run at least one ref head completely no matter what the number of items on it. Fix the accounting to only be adjusted when we add/remove a ref head. In addition to using this number to limit the number of delayed refs run, a future patch is also going to use it to calculate the amount of space required for delayed refs space reservation. Reviewed-by: Nikolay Borisov Signed-off-by: Josef Bacik Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/delayed-ref.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c index 62ff545ba1f71..7e5c81e80e15d 100644 --- a/fs/btrfs/delayed-ref.c +++ b/fs/btrfs/delayed-ref.c @@ -234,8 +234,6 @@ static inline void drop_delayed_ref(struct btrfs_trans_handle *trans, ref->in_tree = 0; btrfs_put_delayed_ref(ref); atomic_dec(&delayed_refs->num_entries); - if (trans->delayed_ref_updates) - trans->delayed_ref_updates--; } static bool merge_ref(struct btrfs_trans_handle *trans, @@ -446,7 +444,6 @@ inserted: if (ref->action == BTRFS_ADD_DELAYED_REF) list_add_tail(&ref->add_list, &href->ref_add_list); atomic_inc(&root->num_entries); - trans->delayed_ref_updates++; spin_unlock(&href->lock); return ret; } -- 2.20.1