btrfs-progs: qgroup: fix qgroup show sort by multi items

[platform/upstream/btrfs-progs.git] / qgroup.c

diff --git a/qgroup.c b/qgroup.c
index 9d10cb8..7e8ef07 100644 (file)
--- a/qgroup.c
+++ b/qgroup.c
@@ -480,7 +480,7 @@ int btrfs_qgroup_setup_comparer(struct btrfs_qgroup_comparer_set  **comp_set,
                *comp_set = set;
        }
 
-       ASSERT(set->comps[set->ncomps].comp_func != NULL);
+       ASSERT(set->comps[set->ncomps].comp_func == NULL);
 
        set->comps[set->ncomps].comp_func = all_comp_funcs[comparer];
        set->comps[set->ncomps].is_descending = is_descending;
@@ -847,7 +847,7 @@ int btrfs_qgroup_setup_filter(struct btrfs_qgroup_filter_set **filter_set,
                *filter_set = set;
        }
 
-       ASSERT(set->filters[set->nfilters].filter_func != NULL);
+       ASSERT(set->filters[set->nfilters].filter_func == NULL);
        set->filters[set->nfilters].filter_func = all_filter_funcs[filter];
        set->filters[set->nfilters].data = data;
        set->nfilters++;
@@ -1064,11 +1064,9 @@ static int __qgroups_search(int fd, struct qgroup_lookup *qgroup_lookup)
 
        while (1) {
                ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args);
-               if (ret < 0) {
-                       error("cannot perform the search: %s",
-                                       strerror(errno));
-                       return ret;
-               }
+               if (ret < 0)
+                       return -errno;
+
                /* the ioctl returns the number of item it found in nr_items */
                if (sk->nr_items == 0)
                        break;
@@ -1224,7 +1222,8 @@ int btrfs_qgroup_parse_sort_string(const char *opt_arg,
        if (!opt_tmp)
                return -ENOMEM;
 
-       while ((p = strtok(opt_tmp, ",")) != NULL) {
+       p = strtok(opt_tmp, ",");
+       while (p) {
                flag = 0;
                ptr_argv = all_sort_items;
 
@@ -1264,8 +1263,7 @@ int btrfs_qgroup_parse_sort_string(const char *opt_arg,
                        }
                        btrfs_qgroup_setup_comparer(comps, what_to_sort, order);
                }
-               free(opt_tmp);
-               opt_tmp = NULL;
+               p = strtok(NULL, ",");
        }
 
 out: