On Fri, Sep 06, 2013 at 05:37:52PM +0800, Anand Jain wrote:
> +static char *group_type_str(u64 flag)
> {
> - struct btrfs_ioctl_space_args *sargs, *sargs_orig;
> - u64 count = 0, i;
> - int ret;
> - int fd;
> - int e;
> - char *path;
> - DIR *dirstream = NULL;
> -
> - if (check_argc_exact(argc, 2))
> - usage(cmd_df_usage);
> -
> - path = argv[1];
> + switch (flag & BTRFS_BLOCK_GROUP_TYPE_MASK) {
> + case BTRFS_BLOCK_GROUP_DATA:
> + return "data";
> + case BTRFS_BLOCK_GROUP_SYSTEM:
> + return "system";
> + case BTRFS_BLOCK_GROUP_METADATA:
> + return "metadata";
> + case BTRFS_BLOCK_GROUP_DATA|BTRFS_BLOCK_GROUP_METADATA:
> + return "mixed";
I think the profile names should stay unchanged, ie Data, System etc,
and Data+Metadata instead of mixed. We can change the output format
later, but for this preparatory patch I'd stick with what it is.
> + default:
> + return "unknown";
> + }
> +}
>
> - fd = open_file_or_dir(path, &dirstream);
> - if (fd < 0) {
> - fprintf(stderr, "ERROR: can't access to '%s'\n", path);
> - return 12;
> +static char *group_profile_str(u64 flag)
> +{
> + switch (flag & BTRFS_BLOCK_GROUP_PROFILE_MASK) {
> + case 0:
> + return "single";
The 'single' profile was not explicitly mentioned before, I tend to
think that it's better to be consistent with the rest and add it as you
do in this patch.
Sample output:
$ ./btrfs fi df /mnt/enospc/mnt
data, single: total=5.92GiB, used=4.41GiB
system, DUP: total=8.00MiB, used=4.00KiB
system, single: total=4.00MiB, used=0.00
metadata, DUP: total=1.02GiB, used=828.10MiB
metadata, single: total=8.00MiB, used=0.00
looks imho ok.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
