From patchwork Wed Oct 25 02:54:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 10025767 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0EECE604D7 for ; Wed, 25 Oct 2017 02:55:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0011D28AA9 for ; Wed, 25 Oct 2017 02:55:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E956628AC8; Wed, 25 Oct 2017 02:55:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8BD3228ACB for ; Wed, 25 Oct 2017 02:55:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751978AbdJYCzS (ORCPT ); Tue, 24 Oct 2017 22:55:18 -0400 Received: from prv3-mh.provo.novell.com ([137.65.250.26]:60639 "EHLO prv3-mh.provo.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751964AbdJYCzH (ORCPT ); Tue, 24 Oct 2017 22:55:07 -0400 Received: from adam-pc.lan (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by prv3-mh.provo.novell.com with ESMTP (NOT encrypted); Tue, 24 Oct 2017 20:54:59 -0600 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz Subject: [PATCH v2 6/6] btrfs: qgroup: Cleanup the remaining old reservation counters Date: Wed, 25 Oct 2017 10:54:45 +0800 Message-Id: <20171025025445.16617-7-wqu@suse.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171025025445.16617-1-wqu@suse.com> References: <20171025025445.16617-1-wqu@suse.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP So qgroup is switched to new separate types reservation system. Signed-off-by: Qu Wenruo --- fs/btrfs/qgroup.c | 13 ------------- fs/btrfs/qgroup.h | 1 - 2 files changed, 14 deletions(-) diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 0a38e65f55f7..4063004ae9d5 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -1065,19 +1065,6 @@ static void qgroup_dirty(struct btrfs_fs_info *fs_info, list_add(&qgroup->dirty, &fs_info->dirty_qgroups); } -static void report_reserved_underflow(struct btrfs_fs_info *fs_info, - struct btrfs_qgroup *qgroup, - u64 num_bytes) -{ -#ifdef CONFIG_BTRFS_DEBUG - WARN_ON(qgroup->reserved < num_bytes); - btrfs_debug(fs_info, - "qgroup %llu reserved space underflow, have: %llu, to free: %llu", - qgroup->qgroupid, qgroup->reserved, num_bytes); -#endif - qgroup->reserved = 0; -} - /* * The easy accounting, we're updating qgroup relationship whose child qgroup * only has exclusive extents. diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h index fead9955af72..c8c81b923674 100644 --- a/fs/btrfs/qgroup.h +++ b/fs/btrfs/qgroup.h @@ -107,7 +107,6 @@ struct btrfs_qgroup { /* * reservation tracking */ - u64 reserved; struct btrfs_qgroup_rsv rsv; /*