btrfs-progs: mkfs: Separate shrink from rootdir

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

diff --git a/btrfs-list.c b/btrfs-list.c
index 92a537f..b6d7658 100644 (file)
--- a/btrfs-list.c
+++ b/btrfs-list.c
@@ -1273,8 +1273,18 @@ static void filter_and_sort_subvol(struct root_lookup *all_subvols,
 
                ret = resolve_root(all_subvols, entry, top_id);
                if (ret == -ENOENT) {
-                       entry->full_path = strdup("DELETED");
-                       entry->deleted = 1;
+                       if (entry->root_id != BTRFS_FS_TREE_OBJECTID) {
+                               entry->full_path = strdup("DELETED");
+                               entry->deleted = 1;
+                       } else {
+                               /*
+                                * The full path is not supposed to be printed,
+                                * but we don't want to print an empty string,
+                                * in case it appears somewhere.
+                                */
+                               entry->full_path = strdup("TOPLEVEL");
+                               entry->deleted = 0;
+                       }
                }
                ret = filter_root(entry, filter_set);
                if (ret)
@@ -1340,21 +1350,21 @@ static void print_subvolume_column(struct root_info *subv,
                        strcpy(uuidparse, "-");
                else
                        uuid_unparse(subv->uuid, uuidparse);
-               printf("%s", uuidparse);
+               printf("%-36s", uuidparse);
                break;
        case BTRFS_LIST_PUUID:
                if (uuid_is_null(subv->puuid))
                        strcpy(uuidparse, "-");
                else
                        uuid_unparse(subv->puuid, uuidparse);
-               printf("%s", uuidparse);
+               printf("%-36s", uuidparse);
                break;
        case BTRFS_LIST_RUUID:
                if (uuid_is_null(subv->ruuid))
                        strcpy(uuidparse, "-");
                else
                        uuid_unparse(subv->ruuid, uuidparse);
-               printf("%s", uuidparse);
+               printf("%-36s", uuidparse);
                break;
        case BTRFS_LIST_PATH:
                BUG_ON(!subv->full_path);
@@ -1459,6 +1469,11 @@ static void print_all_subvol_info(struct root_lookup *sorted_tree,
        n = rb_first(&sorted_tree->root);
        while (n) {
                entry = rb_entry(n, struct root_info, sort_node);
+
+               /* The toplevel subvolume is not listed by default */
+               if (entry->root_id == BTRFS_FS_TREE_OBJECTID)
+                       goto next;
+
                switch (layout) {
                case BTRFS_LIST_LAYOUT_DEFAULT:
                        print_one_subvol_info_default(entry);
@@ -1470,6 +1485,7 @@ static void print_all_subvol_info(struct root_lookup *sorted_tree,
                        print_one_subvol_info_raw(entry, raw_prefix);
                        break;
                }
+next:
                n = rb_next(n);
        }
 }