btrfs-progs: docs: add missing short option for qroup-report

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

diff --git a/btrfs-list.c b/btrfs-list.c
index b93a5be..92a537f 100644 (file)
--- a/btrfs-list.c
+++ b/btrfs-list.c
@@ -124,11 +124,6 @@ void btrfs_list_setup_print_column(enum btrfs_list_column_enum column)
                btrfs_list_columns[i].need_print = 1;
 }
 
-static void root_lookup_init(struct root_lookup *tree)
-{
-       tree->root.rb_node = NULL;
-}
-
 static int comp_entry_with_rootid(struct root_info *entry1,
                                  struct root_info *entry2,
                                  int is_descending)
@@ -282,7 +277,7 @@ static int sort_comp(struct root_info *entry1, struct root_info *entry2,
        int i, ret = 0;
 
        if (!set || !set->ncomps)
-               goto comp_rootid;
+               return comp_entry_with_rootid(entry1, entry2, 0);
 
        for (i = 0; i < set->ncomps; i++) {
                if (!set->comps[i].comp_func)
@@ -297,10 +292,8 @@ static int sort_comp(struct root_info *entry1, struct root_info *entry2,
                        rootid_compared = 1;
        }
 
-       if (!rootid_compared) {
-comp_rootid:
+       if (!rootid_compared)
                ret = comp_entry_with_rootid(entry1, entry2, 0);
-       }
 
        return ret;
 }
@@ -394,7 +387,7 @@ static struct root_info *root_tree_search(struct root_lookup *root_tree,
 static int update_root(struct root_lookup *root_lookup,
                       u64 root_id, u64 ref_tree, u64 root_offset, u64 flags,
                       u64 dir_id, char *name, int name_len, u64 ogen, u64 gen,
-                      time_t otime, void *uuid, void *puuid, void *ruuid)
+                      time_t otime, u8 *uuid, u8 *puuid, u8 *ruuid)
 {
        struct root_info *ri;
 
@@ -457,7 +450,7 @@ static int update_root(struct root_lookup *root_lookup,
 static int add_root(struct root_lookup *root_lookup,
                    u64 root_id, u64 ref_tree, u64 root_offset, u64 flags,
                    u64 dir_id, char *name, int name_len, u64 ogen, u64 gen,
-                   time_t otime, void *uuid, void *puuid, void *ruuid)
+                   time_t otime, u8 *uuid, u8 *puuid, u8 *ruuid)
 {
        struct root_info *ri;
        int ret;
@@ -511,9 +504,9 @@ static int add_root(struct root_lookup *root_lookup,
                memcpy(&ri->ruuid, ruuid, BTRFS_UUID_SIZE);
 
        ret = root_tree_insert(root_lookup, ri);
-       if (ret) {
-               error("failed to insert tree %llu",
-                               (unsigned long long)root_id);
+       if (ret < 0) {
+               error("failed to insert subvolume %llu to tree: %s",
+                               (unsigned long long)root_id, strerror(-ret));
                exit(1);
        }
        return 0;
@@ -982,18 +975,15 @@ static int list_subvol_search(int fd, struct root_lookup *root_lookup)
        u64 ogen;
        u64 flags;
        int i;
-       u8 uuid[BTRFS_UUID_SIZE];
-       u8 puuid[BTRFS_UUID_SIZE];
-       u8 ruuid[BTRFS_UUID_SIZE];
 
-       root_lookup_init(root_lookup);
+       root_lookup->root.rb_node = NULL;
        memset(&args, 0, sizeof(args));
 
        sk->tree_id = BTRFS_ROOT_TREE_OBJECTID;
        /* Search both live and deleted subvolumes */
        sk->min_type = BTRFS_ROOT_ITEM_KEY;
        sk->max_type = BTRFS_ROOT_BACKREF_KEY;
-       sk->min_objectid = BTRFS_FIRST_FREE_OBJECTID;
+       sk->min_objectid = BTRFS_FS_TREE_OBJECTID;
        sk->max_objectid = BTRFS_LAST_FREE_OBJECTID;
        sk->max_offset = (u64)-1;
        sk->max_transid = (u64)-1;
@@ -1024,8 +1014,13 @@ static int list_subvol_search(int fd, struct root_lookup *root_lookup)
                                add_root_backref(root_lookup, sh.objectid,
                                                sh.offset, dir_id, name,
                                                name_len);
-                       } else if (sh.type == BTRFS_ROOT_ITEM_KEY) {
+                       } else if (sh.type == BTRFS_ROOT_ITEM_KEY &&
+                                  (sh.objectid >= BTRFS_FIRST_FREE_OBJECTID ||
+                                   sh.objectid == BTRFS_FS_TREE_OBJECTID)) {
                                time_t otime;
+                               u8 uuid[BTRFS_UUID_SIZE];
+                               u8 puuid[BTRFS_UUID_SIZE];
+                               u8 ruuid[BTRFS_UUID_SIZE];
 
                                ri = (struct btrfs_root_item *)(args.buf + off);
                                gen = btrfs_root_generation(ri);
@@ -1270,7 +1265,7 @@ static void filter_and_sort_subvol(struct root_lookup *all_subvols,
        struct root_info *entry;
        int ret;
 
-       root_lookup_init(sort_tree);
+       sort_tree->root.rb_node = NULL;
 
        n = rb_last(&all_subvols->root);
        while (n) {
@@ -1531,6 +1526,37 @@ static char *strdup_or_null(const char *s)
        return strdup(s);
 }
 
+int btrfs_get_toplevel_subvol(int fd, struct root_info *the_ri)
+{
+       int ret;
+       struct root_lookup rl;
+       struct rb_node *rbn;
+       struct root_info *ri;
+       u64 root_id;
+
+       ret = btrfs_list_get_path_rootid(fd, &root_id);
+       if (ret)
+               return ret;
+
+       ret = btrfs_list_subvols(fd, &rl);
+       if (ret)
+               return ret;
+
+       rbn = rb_first(&rl.root);
+       ri = rb_entry(rbn, struct root_info, rb_node);
+
+       if (ri->root_id != BTRFS_FS_TREE_OBJECTID)
+               return -ENOENT;
+
+       memcpy(the_ri, ri, offsetof(struct root_info, path));
+       the_ri->path = strdup_or_null("/");
+       the_ri->name = strdup_or_null("<FS_TREE>");
+       the_ri->full_path = strdup_or_null("/");
+       rb_free_nodes(&rl.root, free_root_info);
+
+       return ret;
+}
+
 int btrfs_get_subvol(int fd, struct root_info *the_ri)
 {
        int ret, rr;
@@ -1556,7 +1582,9 @@ int btrfs_get_subvol(int fd, struct root_info *the_ri)
                        rbn = rb_next(rbn);
                        continue;
                }
-               if (!comp_entry_with_rootid(the_ri, ri, 0)) {
+
+               if (!comp_entry_with_rootid(the_ri, ri, 0) ||
+                       !uuid_compare(the_ri->uuid, ri->uuid)) {
                        memcpy(the_ri, ri, offsetof(struct root_info, path));
                        the_ri->path = strdup_or_null(ri->path);
                        the_ri->name = strdup_or_null(ri->name);