Re: [PATCH 3/3] btrfs: qgroup: fix a wrong parameter of no_quota.

[Dongsheng Yang]

On 02/10/2015 07:24 PM, Filipe David Manana wrote:

On Tue, Feb 10, 2015 at 10:24 AM, Dongsheng Yang
<yangds.f...@cn.fujitsu.com> wrote:

In function of __btrfs_mod_ref(), we are passing the no_quota=1
to process_func() anyway. It will make the numbers in qgroup be
wrong when deleting a subvolume. The data size in a deleted subvolume
will never be decressed from all related qgroups.

How about getting a test case for xfstests for this?

Good idea!!

Will do it.

Thanx

thanks

Signed-off-by: Dongsheng Yang <yangds.f...@cn.fujitsu.com>
---
  fs/btrfs/extent-tree.c | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 652be74..f59809c 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3056,6 +3056,7 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle 
*trans,
         int i;
         int level;
         int ret = 0;
+       int no_quota = 0;
         int (*process_func)(struct btrfs_trans_handle *, struct btrfs_root *,
                             u64, u64, u64, u64, u64, u64, int);

@@ -3080,6 +3081,9 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle 
*trans,
         else
                 parent = 0;

+       if (!root->fs_info->quota_enabled || !is_fstree(ref_root))
+               no_quota = 1;
+
         for (i = 0; i < nritems; i++) {
                 if (level == 0) {
                         btrfs_item_key_to_cpu(buf, &key, i);
@@ -3098,7 +3102,7 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle 
*trans,
                         key.offset -= btrfs_file_extent_offset(buf, fi);
                         ret = process_func(trans, root, bytenr, num_bytes,
                                            parent, ref_root, key.objectid,
-                                          key.offset, 1);
+                                          key.offset, no_quota);
                         if (ret)
                                 goto fail;
                 } else {
@@ -3106,7 +3110,7 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle 
*trans,
                         num_bytes = root->nodesize;
                         ret = process_func(trans, root, bytenr, num_bytes,
                                            parent, ref_root, level - 1, 0,
-                                          1);
+                                          no_quota);
                         if (ret)
                                 goto fail;
                 }
--
1.8.4.2

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

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