From: Zheng Liu Subject: Re: [PATCH 4/5] mke2fs: teach mke2fs to understand -b 4k and -C 256M Date: Tue, 15 Jan 2013 23:24:08 +0800 Message-ID: <20130115152408.GD19209@gmail.com> References: <20130114211014.GA22642@thunk.org> <1358210232-30578-1-git-send-email-tytso@mit.edu> <1358210232-30578-4-git-send-email-tytso@mit.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Ext4 Developers List To: Theodore Ts'o Return-path: Received: from mail-pa0-f51.google.com ([209.85.220.51]:35097 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751795Ab3AOPKV (ORCPT ); Tue, 15 Jan 2013 10:10:21 -0500 Received: by mail-pa0-f51.google.com with SMTP id fb11so155827pad.10 for ; Tue, 15 Jan 2013 07:10:21 -0800 (PST) Content-Disposition: inline In-Reply-To: <1358210232-30578-4-git-send-email-tytso@mit.edu> Sender: linux-ext4-owner@vger.kernel.org List-ID: On Mon, Jan 14, 2013 at 07:37:11PM -0500, Theodore Ts'o wrote: > The -b and -C options now use parse_num_blocks2() insteda of strtol, > so that users can specify -C 256M instead of the much less convenient > -C 268435456. > > Signed-off-by: "Theodore Ts'o" Reviewed-by: Zheng Liu Regards, - Zheng > --- > misc/mke2fs.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/misc/mke2fs.c b/misc/mke2fs.c > index 5cb49b3..c16ab33 100644 > --- a/misc/mke2fs.c > +++ b/misc/mke2fs.c > @@ -1324,10 +1324,10 @@ profile_error: > "b:cg:i:jl:m:no:qr:s:t:vC:DE:FG:I:J:KL:M:N:O:R:ST:U:V")) != EOF) { > switch (c) { > case 'b': > - blocksize = strtol(optarg, &tmp, 0); > + blocksize = parse_num_blocks2(optarg, -1); > b = (blocksize > 0) ? blocksize : -blocksize; > if (b < EXT2_MIN_BLOCK_SIZE || > - b > EXT2_MAX_BLOCK_SIZE || *tmp) { > + b > EXT2_MAX_BLOCK_SIZE) { > com_err(program_name, 0, > _("invalid block size - %s"), optarg); > exit(1); > @@ -1345,9 +1345,9 @@ profile_error: > cflag++; > break; > case 'C': > - cluster_size = strtoul(optarg, &tmp, 0); > + cluster_size = parse_num_blocks2(optarg, -1); > if (cluster_size <= EXT2_MIN_CLUSTER_SIZE || > - cluster_size > EXT2_MAX_CLUSTER_SIZE || *tmp) { > + cluster_size > EXT2_MAX_CLUSTER_SIZE) { > com_err(program_name, 0, > _("invalid cluster size - %s"), > optarg); > -- > 1.7.12.rc0.22.gcdd159b >