btrfs-progs: mkfs: make the summary more compact
Single device example: btrfs-progs v4.0.1-39 See http://btrfs.wiki.kernel.org for more information. Label: (null) UUID: a88bfc85-b454-4a32-8de7-276c01f04d58 Node size: 16384 Sector size: 4096 Filesystem size: 2.00GiB Block group profiles: Data: single 8.00MiB Metadata: single 8.00MiB System: single 4.00MiB SSD detected: no Incompat features: extref, skinny-metadata Number of devices: 1 Devices: ID SIZE PATH 1 2.00GiB /dev/sda Multiple devices: btrfs-progs v4.0.1-39 See http://btrfs.wiki.kernel.org for more information. Label: (null) UUID: 9db282ef-55f3-4070-a59f-012a654614b2 Node size: 16384 Sector size: 4096 Filesystem size: 8.00GiB Block group profiles: Data: RAID6 417.50MiB Metadata: RAID6 417.50MiB System: RAID6 20.00MiB SSD detected: no Incompat features: extref, raid56, skinny-metadata Number of devices: 4 Devices: ID SIZE PATH 1 2.00GiB /dev/sda 2 2.00GiB /dev/sdb 3 2.00GiB /dev/sdc 4 2.00GiB /dev/sdd Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
parent
b6179c8942
commit
60447579c4
47
mkfs.c
47
mkfs.c
|
@ -1144,14 +1144,16 @@ static void list_all_devices(struct btrfs_root *root)
|
|||
list_for_each_entry(device, &fs_devices->devices, dev_list)
|
||||
number_of_devices++;
|
||||
|
||||
printf(" Number of devices:\t%d\n", number_of_devices);
|
||||
printf(" ID SIZE PATH\n");
|
||||
printf(" --- ---------- ------------\n");
|
||||
printf("Number of devices: %d\n", number_of_devices);
|
||||
/* printf("Total devices size: %10s\n", */
|
||||
/* pretty_size(total_block_count)); */
|
||||
printf("Devices:\n");
|
||||
printf(" ID SIZE PATH\n");
|
||||
list_for_each_entry_reverse(device, &fs_devices->devices, dev_list) {
|
||||
char dev_uuid[BTRFS_UUID_UNPARSED_SIZE];
|
||||
|
||||
uuid_unparse(device->uuid, dev_uuid);
|
||||
printf(" %3llu %10s %12s\n",
|
||||
printf(" %3llu %10s %s\n",
|
||||
device->devid,
|
||||
pretty_size(device->total_bytes),
|
||||
device->name);
|
||||
|
@ -1159,8 +1161,6 @@ static void list_all_devices(struct btrfs_root *root)
|
|||
}
|
||||
|
||||
printf("\n");
|
||||
printf(" Total devices size: %10s\n",
|
||||
pretty_size(total_block_count));
|
||||
}
|
||||
|
||||
int main(int ac, char **av)
|
||||
|
@ -1618,32 +1618,31 @@ raid_groups:
|
|||
if (verbose) {
|
||||
char features_buf[64];
|
||||
|
||||
printf("BTRFS filesystem summary:\n");
|
||||
printf(" Label:\t\t%s\n", label);
|
||||
printf(" UUID:\t\t\t%s\n", fs_uuid);
|
||||
printf("\n");
|
||||
|
||||
printf(" Node size:\t\t%u\n", nodesize);
|
||||
printf(" Sector size:\t\t%u\n", sectorsize);
|
||||
printf(" Initial chunks:\n");
|
||||
printf("Label: %s\n", label);
|
||||
printf("UUID: %s\n", fs_uuid);
|
||||
printf("Node size: %u\n", nodesize);
|
||||
printf("Sector size: %u\n", sectorsize);
|
||||
printf("Filesystem size: %s\n",
|
||||
pretty_size(btrfs_super_total_bytes(root->fs_info->super_copy)));
|
||||
printf("Block group profiles:\n");
|
||||
if (allocation.data)
|
||||
printf(" Data:\t\t%s\n",
|
||||
printf(" Data: %-8s %16s\n",
|
||||
btrfs_group_profile_str(data_profile),
|
||||
pretty_size(allocation.data));
|
||||
if (allocation.metadata)
|
||||
printf(" Metadata:\t\t%s\n",
|
||||
printf(" Metadata: %-8s %16s\n",
|
||||
btrfs_group_profile_str(metadata_profile),
|
||||
pretty_size(allocation.metadata));
|
||||
if (allocation.mixed)
|
||||
printf(" Data+Metadata:\t%s\n",
|
||||
printf(" Data+Metadata: %-8s %16s\n",
|
||||
btrfs_group_profile_str(data_profile),
|
||||
pretty_size(allocation.mixed));
|
||||
printf(" System:\t\t%s\n",
|
||||
printf(" System: %-8s %16s\n",
|
||||
btrfs_group_profile_str(metadata_profile),
|
||||
pretty_size(allocation.system));
|
||||
printf(" Metadata profile:\t%s\n",
|
||||
btrfs_group_profile_str(metadata_profile));
|
||||
printf(" Data profile:\t\t%s\n",
|
||||
btrfs_group_profile_str(data_profile));
|
||||
printf(" SSD detected:\t\t%s\n", ssd ? "YES" : "NO");
|
||||
printf("SSD detected: %s\n", ssd ? "yes" : "no");
|
||||
btrfs_parse_features_to_string(features_buf, features);
|
||||
printf(" Incompat features:\t%s", features_buf);
|
||||
printf("Incompat features: %s", features_buf);
|
||||
printf("\n");
|
||||
|
||||
list_all_devices(root);
|
||||
|
|
Loading…
Reference in New Issue