3ee7e4de90
- version 3.17
- check: --init-csum-tree acutally does something useful, rebuilds the whole
csum tree
- /dev scanning for btrfs devices is gone
- /proc/partitions scanning is gone, blkid is used exclusively
- new subcommand subvolume sync
- filesystem df: new options to set unit format
- convert: allow to copy label from the origin, or specify a new one
(not all local patches are upstream, maybe next time)
OBS-URL: https://build.opensuse.org/request/show/259501
OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=176
58 lines
1.5 KiB
Diff
58 lines
1.5 KiB
Diff
From 00f8e6d5c8262a3f3738784e21cf1aca08224efb Mon Sep 17 00:00:00 2001
|
|
From: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
|
|
Date: Thu, 6 Mar 2014 11:36:46 +0800
|
|
Subject: [PATCH 06/42] btrfs-progs: cleanup dead return after usage() for
|
|
fi-disk_usage
|
|
|
|
The usage() calls exit() internally, so remove the return after it.
|
|
|
|
Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
|
|
Signed-off-by: David Sterba <dsterba@suse.cz>
|
|
---
|
|
cmds-fi-disk_usage.c | 12 +++---------
|
|
1 file changed, 3 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/cmds-fi-disk_usage.c b/cmds-fi-disk_usage.c
|
|
index 5274a73240cf..edada5bbcf6b 100644
|
|
--- a/cmds-fi-disk_usage.c
|
|
+++ b/cmds-fi-disk_usage.c
|
|
@@ -494,10 +494,8 @@ int cmd_filesystem_df(int argc, char **argv)
|
|
}
|
|
}
|
|
|
|
- if (check_argc_min(argc - optind, 1)) {
|
|
+ if (check_argc_min(argc - optind, 1))
|
|
usage(cmd_filesystem_df_usage);
|
|
- return 21;
|
|
- }
|
|
|
|
for (i = optind; i < argc ; i++) {
|
|
int r, fd;
|
|
@@ -914,10 +912,8 @@ int cmd_filesystem_disk_usage(int argc, char **argv)
|
|
}
|
|
}
|
|
|
|
- if (check_argc_min(argc - optind, 1)) {
|
|
+ if (check_argc_min(argc - optind, 1))
|
|
usage(cmd_filesystem_disk_usage_usage);
|
|
- return 21;
|
|
- }
|
|
|
|
for (i = optind; i < argc ; i++) {
|
|
int r, fd;
|
|
@@ -1050,10 +1046,8 @@ int cmd_device_disk_usage(int argc, char **argv)
|
|
}
|
|
}
|
|
|
|
- if (check_argc_min(argc - optind, 1)) {
|
|
+ if (check_argc_min(argc - optind, 1))
|
|
usage(cmd_device_disk_usage_usage);
|
|
- return 21;
|
|
- }
|
|
|
|
for (i = optind; i < argc ; i++) {
|
|
int r, fd;
|
|
--
|
|
2.1.1
|
|
|