From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753914AbaCaKHd (ORCPT ); Mon, 31 Mar 2014 06:07:33 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:53730 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753514AbaCaKHc (ORCPT ); Mon, 31 Mar 2014 06:07:32 -0400 X-IronPort-AV: E=Sophos;i="4.97,763,1389715200"; d="scan'208";a="9799938" From: Gui Hecheng To: linux-kernel@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Gui Hecheng Subject: [PATCH] lib: add size unit t/p/e to memparse Date: Mon, 31 Mar 2014 18:03:05 +0800 Message-Id: <1396260185-14109-1-git-send-email-guihc.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.1.4 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/03/31 18:04:01, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/03/31 18:04:01, Serialize complete at 2014/03/31 18:04:01 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For modern filesystems such as btrfs, t/p/e size level operations are common. add size unit t/p/e parsing to memparse Signed-off-by: Gui Hecheng --- lib/cmdline.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/lib/cmdline.c b/lib/cmdline.c index eb67911..20a55b0 100644 --- a/lib/cmdline.c +++ b/lib/cmdline.c @@ -119,11 +119,17 @@ char *get_options(const char *str, int nints, int *ints) * @retptr: (output) Optional pointer to next char after parse completes * * Parses a string into a number. The number stored at @ptr is - * potentially suffixed with %K (for kilobytes, or 1024 bytes), - * %M (for megabytes, or 1048576 bytes), or %G (for gigabytes, or - * 1073741824). If the number is suffixed with K, M, or G, then + * potentially suffixed with + * %K (for kilobytes, or 1024 bytes), + * %M (for megabytes, or 1048576 bytes), + * %G (for gigabytes, or 1073741824), + * %T (for terabytes, or 1099511627776), + * %P (for petabytes, or 1125899906842624 bytes), + * %E (for exabytes, or 1152921504606846976 bytes). + * If the number is suffixed with K, M, G, T, P, E, then * the return value is the number multiplied by one kilobyte, one - * megabyte, or one gigabyte, respectively. + * megabyte, one gigabyte, one terabyte, one petabyte, one exabyte, + * respectively. */ unsigned long long memparse(const char *ptr, char **retptr) @@ -133,6 +139,15 @@ unsigned long long memparse(const char *ptr, char **retptr) unsigned long long ret = simple_strtoull(ptr, &endptr, 0); switch (*endptr) { + case 'E': + case 'e': + ret <<= 10; + case 'P': + case 'p': + ret <<= 10; + case 'T': + case 't': + ret <<= 10; case 'G': case 'g': ret <<= 10; -- 1.8.1.4