From 5a657cad467a601bbef49b0ab79f30cd23a53dfe Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 22 Oct 2015 10:26:10 +0200 Subject: [PATCH] btrfs-progs: balance: enhance the usage filter with range We can do more with the balance usage filter. Enhance it so we can specify also the minimum usage of the block groups to process. The 'usage' filter now accepts a range (a..b, can be partial) and needs kernel support. The 'usage=value' filter is equivalent to 'limit=..value' but works on older kernels as well. The min/max values are 32bit, unlike the single-value limit which is 64bit. Signed-off-by: David Sterba --- cmds-balance.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/cmds-balance.c b/cmds-balance.c index 2c5d2eb1..e73bfcf8 100644 --- a/cmds-balance.c +++ b/cmds-balance.c @@ -244,11 +244,30 @@ static int parse_filters(char *filters, struct btrfs_balance_args *args) "an argument\n"); return 1; } - if (parse_u64(value, &args->usage) || - args->usage > 100) { - fprintf(stderr, "Invalid usage argument: %s\n", - value); - return 1; + if (parse_u64(value, &args->usage)) { + if (parse_range_u32(value, &args->usage_min, + &args->usage_max)) { + fprintf(stderr, + "Invalid usage argument: %s\n", + value); + return 1; + } + if (args->usage_max > 100) { + fprintf(stderr, + "Invalid usage argument: %s\n", + value); + } + args->flags &= ~BTRFS_BALANCE_ARGS_USAGE; + args->flags |= BTRFS_BALANCE_ARGS_USAGE_RANGE; + } else { + if (args->usage > 100) { + fprintf(stderr, + "Invalid usage argument: %s\n", + value); + return 1; + } + args->flags &= ~BTRFS_BALANCE_ARGS_USAGE_RANGE; + args->flags |= BTRFS_BALANCE_ARGS_USAGE; } args->flags |= BTRFS_BALANCE_ARGS_USAGE; } else if (!strcmp(this_char, "devid")) {