From f93b47114312663c95d6f5bc81fdb48be2bf921d Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 20 Jun 2019 01:46:21 +0200 Subject: [PATCH] btrfs-progs: move help.[ch] to common/ Signed-off-by: David Sterba --- Makefile | 2 +- btrfs-corrupt-block.c | 2 +- btrfs-find-root.c | 2 +- btrfs-map-logical.c | 2 +- btrfs-select-super.c | 2 +- btrfs.c | 2 +- btrfstune.c | 2 +- check/main.c | 2 +- cmds/balance.c | 2 +- cmds/device.c | 2 +- cmds/filesystem-du.c | 2 +- cmds/filesystem-usage.c | 2 +- cmds/filesystem.c | 2 +- cmds/inspect-dump-super.c | 2 +- cmds/inspect-dump-tree.c | 2 +- cmds/inspect-tree-stats.c | 2 +- cmds/inspect.c | 2 +- cmds/property.c | 2 +- cmds/qgroup.c | 2 +- cmds/quota.c | 2 +- cmds/receive.c | 2 +- cmds/replace.c | 2 +- cmds/rescue.c | 2 +- cmds/restore.c | 2 +- cmds/scrub.c | 2 +- cmds/send.c | 2 +- cmds/subvolume.c | 2 +- help.c => common/help.c | 2 +- help.h => common/help.h | 0 convert/main.c | 2 +- image/main.c | 2 +- mkfs/main.c | 2 +- 32 files changed, 31 insertions(+), 31 deletions(-) rename help.c => common/help.c (99%) rename help.h => common/help.h (100%) diff --git a/Makefile b/Makefile index 400151c5..48725dfc 100644 --- a/Makefile +++ b/Makefile @@ -133,7 +133,7 @@ objects = ctree.o disk-io.o kernel-lib/radix-tree.o extent-tree.o print-tree.o \ qgroup.o free-space-cache.o kernel-lib/list_sort.o props.o \ kernel-shared/ulist.o qgroup-verify.o backref.o string-table.o \ common/task-utils.o \ - inode.o file.o find-root.o free-space-tree.o help.o send-dump.o \ + inode.o file.o find-root.o free-space-tree.o common/help.o send-dump.o \ fsfeatures.o kernel-lib/tables.o kernel-lib/raid56.o transaction.o \ delayed-ref.o cmds_objects = cmds/subvolume.o cmds/filesystem.o cmds/device.o cmds/scrub.o \ diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c index 3e687ea0..10e6756a 100644 --- a/btrfs-corrupt-block.c +++ b/btrfs-corrupt-block.c @@ -31,7 +31,7 @@ #include "transaction.h" #include "list.h" #include "utils.h" -#include "help.h" +#include "common/help.h" #define FIELD_BUF_LEN 80 diff --git a/btrfs-find-root.c b/btrfs-find-root.c index 0b274eb0..2ee6d3cc 100644 --- a/btrfs-find-root.c +++ b/btrfs-find-root.c @@ -35,7 +35,7 @@ #include "crc32c.h" #include "extent-cache.h" #include "find-root.h" -#include "help.h" +#include "common/help.h" #include "commands.h" /* diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c index 6a880e6b..7cecbe08 100644 --- a/btrfs-map-logical.c +++ b/btrfs-map-logical.c @@ -29,7 +29,7 @@ #include "transaction.h" #include "list.h" #include "utils.h" -#include "help.h" +#include "common/help.h" #define BUFFER_SIZE SZ_64K diff --git a/btrfs-select-super.c b/btrfs-select-super.c index 4185df48..5e84b31e 100644 --- a/btrfs-select-super.c +++ b/btrfs-select-super.c @@ -29,7 +29,7 @@ #include "transaction.h" #include "list.h" #include "utils.h" -#include "help.h" +#include "common/help.h" static void print_usage(void) { diff --git a/btrfs.c b/btrfs.c index dac8ef7c..9af8ff83 100644 --- a/btrfs.c +++ b/btrfs.c @@ -23,7 +23,7 @@ #include "crc32c.h" #include "commands.h" #include "utils.h" -#include "help.h" +#include "common/help.h" static const char * const btrfs_cmd_group_usage[] = { "btrfs [--help] [--version] [...] []", diff --git a/btrfstune.c b/btrfstune.c index 6c1a59dd..aa162d4c 100644 --- a/btrfstune.c +++ b/btrfstune.c @@ -32,7 +32,7 @@ #include "transaction.h" #include "utils.h" #include "volumes.h" -#include "help.h" +#include "common/help.h" static char *device; static int force = 0; diff --git a/check/main.c b/check/main.c index 581f1384..be09bf8c 100644 --- a/check/main.c +++ b/check/main.c @@ -43,7 +43,7 @@ #include "backref.h" #include "kernel-shared/ulist.h" #include "hash.h" -#include "help.h" +#include "common/help.h" #include "check/mode-common.h" #include "check/mode-original.h" #include "check/mode-lowmem.h" diff --git a/cmds/balance.c b/cmds/balance.c index 7fb3d8d5..c74c94b5 100644 --- a/cmds/balance.c +++ b/cmds/balance.c @@ -32,7 +32,7 @@ #include "commands.h" #include "utils.h" -#include "help.h" +#include "common/help.h" static const char * const balance_cmd_group_usage[] = { "btrfs balance [options] ", diff --git a/cmds/device.c b/cmds/device.c index 80275058..1c06cbd1 100644 --- a/cmds/device.c +++ b/cmds/device.c @@ -32,7 +32,7 @@ #include "cmds/filesystem-usage.h" #include "commands.h" -#include "help.h" +#include "common/help.h" #include "mkfs/common.h" static const char * const device_cmd_group_usage[] = { diff --git a/cmds/filesystem-du.c b/cmds/filesystem-du.c index 6d034b3b..3e7d5ddf 100644 --- a/cmds/filesystem-du.c +++ b/cmds/filesystem-du.c @@ -40,7 +40,7 @@ #include "rbtree.h" #include "interval_tree_generic.h" -#include "help.h" +#include "common/help.h" #include "fsfeatures.h" static int summarize = 0; diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c index e5331bb1..7408a35b 100644 --- a/cmds/filesystem-usage.c +++ b/cmds/filesystem-usage.c @@ -33,7 +33,7 @@ #include "disk-io.h" #include "version.h" -#include "help.h" +#include "common/help.h" /* * Add the chunk info to the chunk_info list diff --git a/cmds/filesystem.c b/cmds/filesystem.c index 2afc21d4..9ded64ab 100644 --- a/cmds/filesystem.c +++ b/cmds/filesystem.c @@ -39,7 +39,7 @@ #include "cmds/filesystem-usage.h" #include "list_sort.h" #include "disk-io.h" -#include "help.h" +#include "common/help.h" #include "fsfeatures.h" /* diff --git a/cmds/inspect-dump-super.c b/cmds/inspect-dump-super.c index a85937fd..b616a86f 100644 --- a/cmds/inspect-dump-super.c +++ b/cmds/inspect-dump-super.c @@ -33,7 +33,7 @@ #include "utils.h" #include "commands.h" #include "crc32c.h" -#include "help.h" +#include "common/help.h" static int check_csum_sblock(void *sb, int csum_size) { diff --git a/cmds/inspect-dump-tree.c b/cmds/inspect-dump-tree.c index 1588a0b0..aa1759f3 100644 --- a/cmds/inspect-dump-tree.c +++ b/cmds/inspect-dump-tree.c @@ -31,7 +31,7 @@ #include "volumes.h" #include "commands.h" #include "utils.h" -#include "help.h" +#include "common/help.h" static void print_extents(struct extent_buffer *eb) { diff --git a/cmds/inspect-tree-stats.c b/cmds/inspect-tree-stats.c index 10d6071e..b7cf81ca 100644 --- a/cmds/inspect-tree-stats.c +++ b/cmds/inspect-tree-stats.c @@ -35,7 +35,7 @@ #include "volumes.h" #include "utils.h" #include "commands.h" -#include "help.h" +#include "common/help.h" static int verbose = 0; static int no_pretty = 0; diff --git a/cmds/inspect.c b/cmds/inspect.c index b4dbf002..531179fe 100644 --- a/cmds/inspect.c +++ b/cmds/inspect.c @@ -31,7 +31,7 @@ #include "disk-io.h" #include "commands.h" #include "btrfs-list.h" -#include "help.h" +#include "common/help.h" static const char * const inspect_cmd_group_usage[] = { "btrfs inspect-internal ", diff --git a/cmds/property.c b/cmds/property.c index c9164dd0..772ae982 100644 --- a/cmds/property.c +++ b/cmds/property.c @@ -26,7 +26,7 @@ #include "props.h" #include "ctree.h" #include "utils.h" -#include "help.h" +#include "common/help.h" static const char * const property_cmd_group_usage[] = { "btrfs property get/set/list [-t ] [] [value]", diff --git a/cmds/qgroup.c b/cmds/qgroup.c index b4a00e81..f424f970 100644 --- a/cmds/qgroup.c +++ b/cmds/qgroup.c @@ -28,7 +28,7 @@ #include "commands.h" #include "qgroup.h" #include "utils.h" -#include "help.h" +#include "common/help.h" static const char * const qgroup_cmd_group_usage[] = { "btrfs qgroup [options] ", diff --git a/cmds/quota.c b/cmds/quota.c index d0dcfa80..4156578e 100644 --- a/cmds/quota.c +++ b/cmds/quota.c @@ -24,7 +24,7 @@ #include "commands.h" #include "utils.h" -#include "help.h" +#include "common/help.h" static const char * const quota_cmd_group_usage[] = { "btrfs quota [options] ", diff --git a/cmds/receive.c b/cmds/receive.c index b833526e..7e92fd13 100644 --- a/cmds/receive.c +++ b/cmds/receive.c @@ -50,7 +50,7 @@ #include "send-stream.h" #include "send-utils.h" #include "send-dump.h" -#include "help.h" +#include "common/help.h" /* * Default is 1 for historical reasons, changing may break scripts that expect diff --git a/cmds/replace.c b/cmds/replace.c index 72d1f7fa..1b79b3d5 100644 --- a/cmds/replace.c +++ b/cmds/replace.c @@ -37,7 +37,7 @@ #include "disk-io.h" #include "commands.h" -#include "help.h" +#include "common/help.h" #include "mkfs/common.h" static int print_replace_status(int fd, const char *path, int once); diff --git a/cmds/rescue.c b/cmds/rescue.c index 1b93a5c4..f7620739 100644 --- a/cmds/rescue.c +++ b/cmds/rescue.c @@ -25,7 +25,7 @@ #include "disk-io.h" #include "commands.h" #include "utils.h" -#include "help.h" +#include "common/help.h" #include "cmds/rescue.h" static const char * const rescue_cmd_group_usage[] = { diff --git a/cmds/restore.c b/cmds/restore.c index 0b1a617b..f5300dc7 100644 --- a/cmds/restore.c +++ b/cmds/restore.c @@ -45,7 +45,7 @@ #include "volumes.h" #include "utils.h" #include "commands.h" -#include "help.h" +#include "common/help.h" static char fs_name[PATH_MAX]; static char path_name[PATH_MAX]; diff --git a/cmds/scrub.c b/cmds/scrub.c index 12a2c1c8..171955b5 100644 --- a/cmds/scrub.c +++ b/cmds/scrub.c @@ -44,7 +44,7 @@ #include "disk-io.h" #include "commands.h" -#include "help.h" +#include "common/help.h" static const char * const scrub_cmd_group_usage[] = { "btrfs scrub [options] |", diff --git a/cmds/send.c b/cmds/send.c index 72e6fb85..b3fedf66 100644 --- a/cmds/send.c +++ b/cmds/send.c @@ -43,7 +43,7 @@ #include "send.h" #include "send-utils.h" -#include "help.h" +#include "common/help.h" #define SEND_BUFFER_SIZE SZ_64K diff --git a/cmds/subvolume.c b/cmds/subvolume.c index efb74788..e3ef8f75 100644 --- a/cmds/subvolume.c +++ b/cmds/subvolume.c @@ -40,7 +40,7 @@ #include "utils.h" #include "btrfs-list.h" #include "utils.h" -#include "help.h" +#include "common/help.h" static int wait_for_subvolume_cleaning(int fd, size_t count, uint64_t *ids, int sleep_interval) diff --git a/help.c b/common/help.c similarity index 99% rename from help.c rename to common/help.c index b94fa116..3e99521f 100644 --- a/help.c +++ b/common/help.c @@ -22,7 +22,7 @@ #include "commands.h" #include "utils.h" -#include "help.h" +#include "common/help.h" #define USAGE_SHORT 1U #define USAGE_LONG 2U diff --git a/help.h b/common/help.h similarity index 100% rename from help.h rename to common/help.h diff --git a/convert/main.c b/convert/main.c index 313e84db..3c8bc8f6 100644 --- a/convert/main.c +++ b/convert/main.c @@ -97,7 +97,7 @@ #include "transaction.h" #include "utils.h" #include "common/task-utils.h" -#include "help.h" +#include "common/help.h" #include "mkfs/common.h" #include "convert/common.h" #include "convert/source-fs.h" diff --git a/image/main.c b/image/main.c index f155794c..cababa95 100644 --- a/image/main.c +++ b/image/main.c @@ -35,7 +35,7 @@ #include "utils.h" #include "volumes.h" #include "extent_io.h" -#include "help.h" +#include "common/help.h" #include "image/metadump.h" #include "image/sanitize.h" diff --git a/mkfs/main.c b/mkfs/main.c index 59e4edf0..937bf43b 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -38,7 +38,7 @@ #include "transaction.h" #include "utils.h" #include "list_sort.h" -#include "help.h" +#include "common/help.h" #include "rbtree-utils.h" #include "mkfs/common.h" #include "mkfs/rootdir.h"