From patchwork Tue Oct 13 15:42:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 7386401 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0D3149F506 for ; Tue, 13 Oct 2015 15:47:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2FBD020827 for ; Tue, 13 Oct 2015 15:47:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0508820824 for ; Tue, 13 Oct 2015 15:47:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932629AbbJMPrN (ORCPT ); Tue, 13 Oct 2015 11:47:13 -0400 Received: from mx2.suse.de ([195.135.220.15]:38520 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932610AbbJMPnd (ORCPT ); Tue, 13 Oct 2015 11:43:33 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 9D79AABCC for ; Tue, 13 Oct 2015 15:43:31 +0000 (UTC) Received: by ds.suse.cz (Postfix, from userid 10065) id 9CF90DAB57; Tue, 13 Oct 2015 17:42:23 +0200 (CEST) From: David Sterba To: linux-btrfs@vger.kernel.org Cc: David Sterba Subject: [PATCH 2/7] btrfs-progs: extend parse_range API to accept a relaxed range Date: Tue, 13 Oct 2015 17:42:23 +0200 Message-Id: <7edb64ff3707c11e1deaa2556db16f788fbc9011.1444750808.git.dsterba@suse.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: References: Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In some cases we want to accept a range of type [a..a]. Add a new function to do the 'a < b' check for the caller and use it. Signed-off-by: David Sterba --- cmds-balance.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/cmds-balance.c b/cmds-balance.c index 798b533aa7d6..62bee3cc78b6 100644 --- a/cmds-balance.c +++ b/cmds-balance.c @@ -126,9 +126,10 @@ static int parse_range(const char *range, u64 *start, u64 *end) return 1; } - if (*start >= *end) { - fprintf(stderr, "Range %llu..%llu doesn't make " - "sense\n", (unsigned long long)*start, + if (*start > *end) { + fprintf(stderr, + "ERROR: range %llu..%llu doesn't make sense\n", + (unsigned long long)*start, (unsigned long long)*end); return 1; } @@ -139,6 +140,25 @@ static int parse_range(const char *range, u64 *start, u64 *end) return 1; } +/* + * Parse range and check if start < end + */ +static int parse_range_strict(const char *range, u64 *start, u64 *end) +{ + if (parse_range(range, start, end) == 0) { + if (*start >= *end) { + fprintf(stderr, + "ERROR: range %llu..%llu not allowed\n", + (unsigned long long)*start, + (unsigned long long)*end); + return 1; + } + return 0; + } + + return 1; +} + static int parse_filters(char *filters, struct btrfs_balance_args *args) { char *this_char; @@ -196,7 +216,7 @@ static int parse_filters(char *filters, struct btrfs_balance_args *args) "an argument\n"); return 1; } - if (parse_range(value, &args->pstart, &args->pend)) { + if (parse_range_strict(value, &args->pstart, &args->pend)) { fprintf(stderr, "Invalid drange argument\n"); return 1; } @@ -207,7 +227,7 @@ static int parse_filters(char *filters, struct btrfs_balance_args *args) "an argument\n"); return 1; } - if (parse_range(value, &args->vstart, &args->vend)) { + if (parse_range_strict(value, &args->vstart, &args->vend)) { fprintf(stderr, "Invalid vrange argument\n"); return 1; }