[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-btrfs
Subject:    [RFC PATCH v5 4/5] Btrfs: disable qgroups accounting when quota is off
From:       Liu Bo <bo.li.liu () oracle ! com>
Date:       2013-07-31 15:37:44
Message-ID: 1375285066-14173-5-git-send-email-bo.li.liu () oracle ! com
[Download RAW message or body]

So we don't need to do qgroups accounting trick without enabling quota.
This reduces my tester's costing time from ~28s to ~23s.  

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
---
 fs/btrfs/extent-tree.c |    6 ++++++
 fs/btrfs/qgroup.c      |    6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 10a5c72..c6612f5 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -2524,6 +2524,12 @@ int btrfs_delayed_refs_qgroup_accounting(struct btrfs_trans_handle *trans,
 	struct qgroup_update *qgroup_update;
 	int ret = 0;
 
+	if (!trans->root->fs_info->quota_enabled) {
+		if (trans->delayed_ref_elem.seq)
+			btrfs_put_tree_mod_seq(fs_info, &trans->delayed_ref_elem);
+		return 0;
+	}
+
 	if (list_empty(&trans->qgroup_ref_list) !=
 	    !trans->delayed_ref_elem.seq) {
 		/* list without seq or seq without list */
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 1280eff..f3e82aa 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1200,6 +1200,9 @@ int btrfs_qgroup_record_ref(struct btrfs_trans_handle *trans,
 {
 	struct qgroup_update *u;
 
+	if (!trans->root->fs_info->quota_enabled)
+		return 0;
+
 	BUG_ON(!trans->delayed_ref_elem.seq);
 	u = kmalloc(sizeof(*u), GFP_NOFS);
 	if (!u)
@@ -1850,6 +1853,9 @@ out:
 
 void assert_qgroups_uptodate(struct btrfs_trans_handle *trans)
 {
+	if (!trans->root->fs_info->quota_enabled)
+		return;
+
 	if (list_empty(&trans->qgroup_ref_list) && !trans->delayed_ref_elem.seq)
 		return;
 	pr_err("btrfs: qgroups not uptodate in trans handle %p: list is%s empty, seq is %#x.%x\n",
-- 
1.7.7

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]