btrfs: qgroup: only set QUOTA_ENABLED when done reading qgroups

[linux-2.6-microblaze.git] / fs / btrfs / qgroup.c

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index f11f0fc..edb84cc 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -394,7 +394,7 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)
        u64 flags = 0;
        u64 rescan_progress = 0;
 
-       if (btrfs_qgroup_mode(fs_info) == BTRFS_QGROUP_MODE_DISABLED)
+       if (!fs_info->quota_root)
                return 0;
 
        fs_info->qgroup_ulist = ulist_alloc(GFP_KERNEL);
@@ -566,13 +566,12 @@ next2:
 out:
        btrfs_free_path(path);
        fs_info->qgroup_flags |= flags;
-       if (!(fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_ON))
-               clear_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags);
-       else if (fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN &&
-                ret >= 0)
-               ret = qgroup_rescan_init(fs_info, rescan_progress, 0);
-
-       if (ret < 0) {
+       if (ret >= 0) {
+               if (fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_ON)
+                       set_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags);
+               if (fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN)
+                       ret = qgroup_rescan_init(fs_info, rescan_progress, 0);
+       } else {
                ulist_free(fs_info->qgroup_ulist);
                fs_info->qgroup_ulist = NULL;
                fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN;