btrfs-progs: fix btrfsck of space_cache=v2 bitmaps on big-endian

[platform/upstream/btrfs-progs.git] / cmds-fi-usage.c

diff --git a/cmds-fi-usage.c b/cmds-fi-usage.c
index 0299fcc..04d68b1 100644 (file)
--- a/cmds-fi-usage.c
+++ b/cmds-fi-usage.c
@@ -185,11 +185,11 @@ static int load_chunk_info(int fd, struct chunk_info **info_ptr, int *info_count
                                return 1;
                        }
 
-                       off += sh->len;
+                       off += btrfs_search_header_len(sh);
 
-                       sk->min_objectid = sh->objectid;
-                       sk->min_type = sh->type;
-                       sk->min_offset = sh->offset+1;
+                       sk->min_objectid = btrfs_search_header_objectid(sh);
+                       sk->min_type = btrfs_search_header_type(sh);
+                       sk->min_offset = btrfs_search_header_offset(sh)+1;
 
                }
                if (!sk->min_offset)    /* overflow */
@@ -280,7 +280,7 @@ static struct btrfs_ioctl_space_args *load_space_info(int fd, char *path)
 }
 
 /*
- * This function computes the space occuped by a *single* RAID5/RAID6 chunk.
+ * This function computes the space occupied by a *single* RAID5/RAID6 chunk.
  * The computation is performed on the basis of the number of stripes
  * which compose the chunk, which could be different from the number of devices
  * if a disk is added later.
@@ -337,6 +337,7 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
        u64 free_estimated = 0;
        u64 free_min = 0;
        int max_data_ratio = 1;
+       int mixed = 0;
 
        sargs = load_space_info(fd, path);
        if (!sargs) {
@@ -394,10 +395,9 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
                        l_global_reserve_used = sargs->spaces[i].used_bytes;
                }
                if ((flags & (BTRFS_BLOCK_GROUP_DATA | BTRFS_BLOCK_GROUP_METADATA))
-                       == (BTRFS_BLOCK_GROUP_DATA | BTRFS_BLOCK_GROUP_METADATA)) {
-                       warning("MIXED blockgroups not handled");
+                   == (BTRFS_BLOCK_GROUP_DATA | BTRFS_BLOCK_GROUP_METADATA)) {
+                       mixed = 1;
                }
-
                if (flags & BTRFS_BLOCK_GROUP_DATA) {
                        r_data_used += sargs->spaces[i].used_bytes * ratio;
                        r_data_chunks += sargs->spaces[i].total_bytes * ratio;
@@ -414,13 +414,20 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
                }
        }
 
-       r_total_chunks = r_data_chunks + r_metadata_chunks + r_system_chunks;
-       r_total_used = r_data_used + r_metadata_used + r_system_used;
+       r_total_chunks = r_data_chunks + r_system_chunks;
+       r_total_used = r_data_used + r_system_used;
+       if (!mixed) {
+               r_total_chunks += r_metadata_chunks;
+               r_total_used += r_metadata_used;
+       }
        r_total_unused = r_total_size - r_total_chunks;
 
        /* Raw / Logical = raid factor, >= 1 */
        data_ratio = (double)r_data_chunks / l_data_chunks;
-       metadata_ratio = (double)r_metadata_chunks / l_metadata_chunks;
+       if (mixed)
+               metadata_ratio = data_ratio;
+       else
+               metadata_ratio = (double)r_metadata_chunks / l_metadata_chunks;
 
 #if 0
        /* add the raid5/6 allocated space */
@@ -437,6 +444,13 @@ static int print_filesystem_usage_overall(int fd, struct chunk_info *chunkinfo,
         * In non-mixed case there's no difference.
         */
        free_estimated = (r_data_chunks - r_data_used) / data_ratio;
+       /*
+        * For mixed-bg the metadata are left out in calculations thus global
+        * reserve would be lost. Part of it could be permanently allocated,
+        * we have to subtract the used bytes so we don't go under zero free.
+        */
+       if (mixed)
+               free_estimated -= l_global_reserve - l_global_reserve_used;
        free_min = free_estimated;
 
        /* Chop unallocatable space */
@@ -908,7 +922,6 @@ int cmd_filesystem_usage(int argc, char **argv)
 
        unit_mode = get_unit_mode_from_arg(&argc, argv, 1);
 
-       optind = 1;
        while (1) {
                int c;
 
@@ -1010,13 +1023,8 @@ void print_device_sizes(int fd, struct device_info *devinfo, unsigned unit_mode)
        printf("   Device size: %*s%10s\n",
                (int)(20 - strlen("Device size")), "",
                pretty_size_mode(devinfo->device_size, unit_mode));
-#if 0
-       /*
-        * The term has not seen an agreement and we don't want to change it
-        * once it's in non-development branches or even released.
-        */
-       printf("   FS occupied: %*s%10s\n",
-               (int)(20 - strlen("FS occupied")), "",
-               pretty_size_mode(devinfo->size, unit_mode));
-#endif
+       printf("   Device slack: %*s%10s\n",
+               (int)(20 - strlen("Device slack")), "",
+               pretty_size_mode(devinfo->device_size - devinfo->size,
+                       unit_mode));
 }