From patchwork Tue Oct 26 12:23:47 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Hugo Mills <hugo@carfax.org.uk>
X-Patchwork-Id: 282232
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9QCVuhZ017911
	for <patchwork-linux-btrfs@patchwork.kernel.org>;
	Tue, 26 Oct 2010 12:31:57 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S933151Ab0JZMby (ORCPT
	<rfc822;patchwork-linux-btrfs@patchwork.kernel.org>);
	Tue, 26 Oct 2010 08:31:54 -0400
Received: from frost.carfax.org.uk ([212.13.194.111]:3336 "EHLO
	frost.carfax.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S933075Ab0JZMbw (ORCPT
	<rfc822;linux-btrfs@vger.kernel.org>);
	Tue, 26 Oct 2010 08:31:52 -0400
Received: from intmx.carfax.org.uk
	([10.0.0.5] helo=vlad.carfax.org.uk ident=Debian-exim)
	by frost.carfax.org.uk with esmtp (Exim 4.69)
	(envelope-from <hugo-lkml@carfax.org.uk>)
	id 1PAigx-0000SD-80; Tue, 26 Oct 2010 12:31:51 +0000
Received: from hrm by vlad.carfax.org.uk with local (Exim 4.69)
	(envelope-from <hugo-lkml@carfax.org.uk>)
	id 1PAigw-0002HK-Lz; Tue, 26 Oct 2010 13:31:50 +0100
Message-Id: <20101026122401.145167429@carfax.org.uk>
User-Agent: quilt/0.48-1
Date: Tue, 26 Oct 2010 13:23:47 +0100
From: Hugo Mills <hugo@carfax.org.uk>
To: linux-btrfs@vger.kernel.org
Cc: Goffredo Baroncelli <kreijack@libero.it>,
	Frank Kingswood <frank@kingswood-consulting.co.uk>,
	Hugo Mills <hugo@carfax.org.uk>
Subject: [patch v3 3/4] Add an option to show ISO,
	binary or raw bytes counts using show.
References: <20101026122344.934075672@carfax.org.uk>
Content-Disposition: inline; filename=show-numbers
X-frost.carfax.org.uk-Spam-Score: -0.0 (/)
X-frost.carfax.org.uk-Spam-Report: Spam detection software,
	running on the system
	"spamd2.lon.bitfolk.com", has
	identified this incoming email as possible spam. The original message
	has been attached to this so you can view it (if it isn't spam) or
	label
	similar future email.  If you have any questions, see
	the administrator of that system for details.
	Content preview: Change btrfs filesystem show to allow the user to
	control
	the scales used for sizes in the output. Signed-off-by: Hugo Mills
	<hugo@carfax.org.uk>
	--- btrfs.c | 2 +- btrfs_cmds.c | 45
	++++++++++++++++++++++++++++++++++++++-------
	man/btrfs.8.in | 15 ++++++++++----- 3 files changed, 49 insertions(+),
	13 deletions(-) [...]
	Content analysis details:   (-0.0 points, 5.0 required)
	pts rule name              description
	---- ----------------------
	--------------------------------------------------
	-0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay
	domain
Sender: linux-btrfs-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-btrfs.vger.kernel.org>
X-Mailing-List: linux-btrfs@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Tue, 26 Oct 2010 12:31:57 +0000 (UTC)


Index: btrfs-progs-unstable/btrfs.c
===================================================================
--- btrfs-progs-unstable.orig/btrfs.c	2010-10-26 13:01:43.000000000 +0100
+++ btrfs-progs-unstable/btrfs.c	2010-10-26 13:02:40.814489740 +0100
@@ -83,7 +83,7 @@
 		"will occupe all available space on the device."
 	},
 	{ do_show_filesystem, 999,
-	  "filesystem show", "[<uuid>|<label>]\n"
+	  "filesystem show", "[-h|--human-readable|-H|--si] [<uuid>|<label>]\n"
 		"Show the info of a btrfs filesystem. If no <uuid> or <label>\n"
 		"is passed, info of all the btrfs filesystem are shown."
 	},
Index: btrfs-progs-unstable/btrfs_cmds.c
===================================================================
--- btrfs-progs-unstable.orig/btrfs_cmds.c	2010-10-26 13:00:39.000000000 +0100
+++ btrfs-progs-unstable/btrfs_cmds.c	2010-10-26 13:02:40.834488902 +0100
@@ -617,7 +617,7 @@
 	return 0;
 }
 
-static void print_one_uuid(struct btrfs_fs_devices *fs_devices)
+static void print_one_uuid(struct btrfs_fs_devices *fs_devices, int format)
 {
 	char uuidbuf[37];
 	struct list_head *cur;
@@ -634,8 +634,7 @@
 	else
 		printf("Label: none ");
 
-	super_bytes_used = pretty_sizes(device->super_bytes_used,
-									PRETTY_SIZE_RAW);
+	super_bytes_used = pretty_sizes(device->super_bytes_used, format);
 
 	total = device->total_devs;
 	printf(" uuid: %s\n\tTotal devices %llu FS bytes used %s\n", uuidbuf,
@@ -647,8 +646,8 @@
 		char *total_bytes;
 		char *bytes_used;
 		device = list_entry(cur, struct btrfs_device, dev_list);
-		total_bytes = pretty_sizes(device->total_bytes, PRETTY_SIZE_RAW);
-		bytes_used = pretty_sizes(device->bytes_used, PRETTY_SIZE_RAW);
+		total_bytes = pretty_sizes(device->total_bytes, format);
+		bytes_used = pretty_sizes(device->bytes_used, format);
 		printf("\tdevid %4llu size %s used %s path %s\n",
 		       (unsigned long long)device->devid,
 		       total_bytes, bytes_used, device->name);
@@ -662,13 +661,45 @@
 	printf("\n");
 }
 
+const struct option show_options[] = {
+	{ "human-readable", 0, NULL, 'h' },
+	{ "si", 0, NULL, 'H' },
+	{ NULL, 0, NULL, 0 }
+};
+
 int do_show_filesystem(int argc, char **argv)
 {
 	struct list_head *all_uuids;
 	struct btrfs_fs_devices *fs_devices;
 	struct list_head *cur_uuid;
-	char *search = argv[1];
+	char *search;
 	int ret;
+	int format = PRETTY_SIZE_RAW;
+
+	optind = 1;
+	while(1) {
+		int c = getopt_long(argc, argv, "hH", show_options, NULL);
+		if (c < 0)
+			break;
+		switch(c) {
+		case 'h':
+			format = PRETTY_SIZE_BINARY;
+			break;
+		case 'H':
+			format = PRETTY_SIZE_ISO;
+			break;
+		default:
+			fprintf(stderr, "Invalid arguments for show\n");
+			free(argv);
+			return 1;
+		}
+	}
+	if (argc - optind > 1) {
+		fprintf(stderr, "Too many arguments for show\n");
+		free(argv);
+		return 1;
+	}
+	search = argv[optind];
 
 	ret = btrfs_scan_one_dir("/dev", 0);
 	if (ret){
@@ -682,7 +713,7 @@
 					list);
 		if (search && uuid_search(fs_devices, search) == 0)
 			continue;
-		print_one_uuid(fs_devices);
+		print_one_uuid(fs_devices, format);
 	}
 	printf("%s\n", BTRFS_BUILD_VERSION);
 	return 0;
Index: btrfs-progs-unstable/man/btrfs.8.in
===================================================================
--- btrfs-progs-unstable.orig/man/btrfs.8.in	2010-10-26 13:01:27.000000000 +0100
+++ btrfs-progs-unstable/man/btrfs.8.in	2010-10-26 13:03:43.941854637 +0100
@@ -23,6 +23,8 @@
 .PP
 \fBbtrfs\fP \fBfilesystem df\fP\fI [-h|-H|--human-readable|--si] <path>\fP
 .PP
+\fBbtrfs\fP \fBfilesystem show\fP\fI [-h|--human-readable|-H|--si] [<uuid>|<label>]\fP
+.PP
 \fBbtrfs\fP \fBdevice scan\fP\fI [<device> [<device>..]]\fP
 .PP
 \fBbtrfs\fP \fBdevice show\fP\fI <dev>|<label> [<dev>|<label>...]\fP
@@ -140,16 +142,19 @@
 partition after reducing the size of the filesystem.
 .TP
 
-\fBfilesystem show\fR [<uuid>|<label>]\fR
-Show the btrfs filesystem with some additional info. If no UUID or label is
-passed, \fBbtrfs\fR show info of all the btrfs filesystem.
-.TP
-
 \fBfilesystem df\fR [-h|-H|--human-readable|--si] <path>\fR
 Show the amount of space used on this filesystem, in bytes. Options:
 -h, --human-readable Use powers of 2^10 (1024) to report sizes.
 -H, --si Use powers of 10^3 (1000) to report sizes, in SI multiples.
 .TP
+
+\fBfilesystem show\fR [-h|-H|--human-readable|--si] [<uuid>|<label>]\fR
+Show the usage of each device in the btrfs filesystem with the given
+uuid or label, or all filesystems if no uuid or label is provided.
+Options:
+-h, --human-readable Use powers of 2^10 (1024) to report sizes.
+-H, --si Use powers of 10^3 (1000) to report sizes, in SI multiples.
+.TP
 
 \fBdevice balance\fR \fI<path>\fR
 Balance the chunks of the filesystem identified by \fI<path>\fR