diff --git a/cmds/device.c b/cmds/device.c index a79f4040..a81703aa 100644 --- a/cmds/device.c +++ b/cmds/device.c @@ -237,8 +237,8 @@ static int _cmd_device_remove(const struct cmd_struct *cmd, static const char * const cmd_device_remove_usage[] = { "btrfs device remove | [|...] ", "Remove a device from a filesystem", - "", COMMON_USAGE_REMOVE_DELETE, + "", NULL }; @@ -252,8 +252,8 @@ static DEFINE_SIMPLE_COMMAND(device_remove, "remove"); static const char * const cmd_device_delete_usage[] = { "btrfs device delete | [|...] ", "Remove a device from a filesystem (alias of \"btrfs device remove\")", - "", COMMON_USAGE_REMOVE_DELETE, + "", NULL }; @@ -595,6 +595,7 @@ static DEFINE_SIMPLE_COMMAND(device_stats, "stats"); static const char * const cmd_device_usage_usage[] = { "btrfs device usage [options] [..]", "Show detailed information about internal allocations in devices.", + "", HELPINFO_UNITS_SHORT_LONG, NULL }; diff --git a/cmds/filesystem-du.c b/cmds/filesystem-du.c index 4b2a2e60..1cea5fcf 100644 --- a/cmds/filesystem-du.c +++ b/cmds/filesystem-du.c @@ -553,6 +553,7 @@ out: static const char * const cmd_filesystem_du_usage[] = { "btrfs filesystem du [options] [..]", "Summarize disk usage of each file.", + "", "-s|--summarize display only a total for each argument", HELPINFO_UNITS_LONG, NULL diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c index 1979cfed..d82177f2 100644 --- a/cmds/filesystem-usage.c +++ b/cmds/filesystem-usage.c @@ -959,6 +959,7 @@ out: static const char * const cmd_filesystem_usage_usage[] = { "btrfs filesystem usage [options] [..]", "Show detailed information about internal filesystem usage .", + "", HELPINFO_UNITS_SHORT_LONG, "-T show data in tabular format", NULL diff --git a/cmds/filesystem.c b/cmds/filesystem.c index 7e419095..88c9e27a 100644 --- a/cmds/filesystem.c +++ b/cmds/filesystem.c @@ -57,6 +57,7 @@ static const char * const filesystem_cmd_group_usage[] = { static const char * const cmd_filesystem_df_usage[] = { "btrfs filesystem df [options] ", "Show space usage information for a mount point", + "", HELPINFO_UNITS_SHORT_LONG, NULL }; @@ -623,6 +624,7 @@ fail_out: static const char * const cmd_filesystem_show_usage[] = { "btrfs filesystem show [options] [|||label]", "Show the structure of a filesystem", + "", "-d|--all-devices show only disks under /dev containing btrfs filesystem", "-m|--mounted show only mounted btrfs", HELPINFO_UNITS_LONG, diff --git a/cmds/inspect-dump-super.c b/cmds/inspect-dump-super.c index 6707e689..65fb3506 100644 --- a/cmds/inspect-dump-super.c +++ b/cmds/inspect-dump-super.c @@ -508,6 +508,7 @@ static int load_and_dump_sb(char *filename, int fd, u64 sb_bytenr, int full, static const char * const cmd_inspect_dump_super_usage[] = { "btrfs inspect-internal dump-super [options] device [device...]", "Dump superblock from a device in a textual form", + "", "-f|--full print full superblock information, backup roots etc.", "-a|--all print information about all superblocks", "-s|--super specify which copy to print out (values: 0, 1, 2)", diff --git a/cmds/inspect-tree-stats.c b/cmds/inspect-tree-stats.c index 34d9e695..e86262dd 100644 --- a/cmds/inspect-tree-stats.c +++ b/cmds/inspect-tree-stats.c @@ -423,6 +423,7 @@ out: static const char * const cmd_inspect_tree_stats_usage[] = { "btrfs inspect-internal tree-stats [options] ", "Print various stats for trees", + "", "-b raw numbers in bytes", NULL }; diff --git a/cmds/inspect.c b/cmds/inspect.c index 983141ba..758b6e60 100644 --- a/cmds/inspect.c +++ b/cmds/inspect.c @@ -128,6 +128,7 @@ static DEFINE_SIMPLE_COMMAND(inspect_inode_resolve, "inode-resolve"); static const char * const cmd_inspect_logical_resolve_usage[] = { "btrfs inspect-internal logical-resolve [-Pv] [-s bufsize] ", "Get file system paths for the given logical address", + "", "-P skip the path resolving and print the inodes instead", "-v verbose mode", "-s bufsize set inode container's size. This is used to increase inode", @@ -354,6 +355,7 @@ static const char* const cmd_inspect_min_dev_size_usage[] = { "btrfs inspect-internal min-dev-size [options] ", "Get the minimum size the device can be shrunk to. The", "device id 1 is used by default.", + "", "--id DEVID specify the device id to query", NULL }; diff --git a/cmds/qgroup.c b/cmds/qgroup.c index 2bd87964..59b43c98 100644 --- a/cmds/qgroup.c +++ b/cmds/qgroup.c @@ -271,6 +271,7 @@ static DEFINE_SIMPLE_COMMAND(qgroup_destroy, "destroy"); static const char * const cmd_qgroup_show_usage[] = { "btrfs qgroup show [options] ", "Show subvolume quota groups.", + "", "-p print parent qgroup id", "-c print child qgroup id", "-r print limit of referenced size of qgroup", diff --git a/cmds/rescue.c b/cmds/rescue.c index 3dd5f73c..e8eab680 100644 --- a/cmds/rescue.c +++ b/cmds/rescue.c @@ -158,7 +158,6 @@ static DEFINE_SIMPLE_COMMAND(rescue_super_recover, "super-recover"); static const char * const cmd_rescue_zero_log_usage[] = { "btrfs rescue zero-log ", "Clear the tree log. Usable if it's corrupted and prevents mount.", - "", NULL }; @@ -214,7 +213,6 @@ static DEFINE_SIMPLE_COMMAND(rescue_zero_log, "zero-log"); static const char * const cmd_rescue_fix_device_size_usage[] = { "btrfs rescue fix-device-size ", "Re-align device and super block sizes. Usable if newer kernel refuse to mount it due to mismatch super size", - "", NULL }; diff --git a/cmds/send.c b/cmds/send.c index 585b23db..1bf73747 100644 --- a/cmds/send.c +++ b/cmds/send.c @@ -442,7 +442,7 @@ static const char * const cmd_send_usage[] = { "'-p ' option when '-c ' options are given, in", "which case 'btrfs send' will determine a suitable parent among the", "clone sources itself.", - "\n", + "", "-e If sending multiple subvols at once, use the new", " format and omit the end-cmd between the subvols.", "-p Send an incremental stream from to", diff --git a/cmds/subvolume.c b/cmds/subvolume.c index a2c69ce2..32ceea33 100644 --- a/cmds/subvolume.c +++ b/cmds/subvolume.c @@ -928,6 +928,7 @@ static DEFINE_SIMPLE_COMMAND(subvol_find_new, "find-new"); static const char * const cmd_subvol_show_usage[] = { "btrfs subvolume show [options] ", "Show more information about the subvolume (UUIDs, generations, times, snapshots)", + "", "-r|--rootid rootid of the subvolume", "-u|--uuid uuid of the subvolume", HELPINFO_UNITS_SHORT_LONG,