diff options
-rw-r--r-- | btrfs-calc-size.c | 1 | ||||
-rw-r--r-- | btrfs-corrupt-block.c | 1 | ||||
-rw-r--r-- | btrfs-debug-tree.c | 5 | ||||
-rw-r--r-- | btrfs-find-root.c | 1 | ||||
-rw-r--r-- | btrfs-image.c | 1 | ||||
-rw-r--r-- | btrfs-map-logical.c | 1 | ||||
-rw-r--r-- | btrfs-select-super.c | 3 | ||||
-rw-r--r-- | btrfs-show-super.c | 3 | ||||
-rw-r--r-- | btrfs-zero-log.c | 3 | ||||
-rw-r--r-- | btrfs.c | 3 | ||||
-rw-r--r-- | btrfstune.c | 1 | ||||
-rw-r--r-- | chunk-recover.c | 1 | ||||
-rw-r--r-- | cmds-check.c | 3 | ||||
-rw-r--r-- | cmds-filesystem.c | 5 | ||||
-rw-r--r-- | cmds-restore.c | 1 | ||||
-rw-r--r-- | mkfs.c | 9 |
16 files changed, 13 insertions, 29 deletions
diff --git a/btrfs-calc-size.c b/btrfs-calc-size.c index 17d048cc..800ceb60 100644 --- a/btrfs-calc-size.c +++ b/btrfs-calc-size.c @@ -31,7 +31,6 @@ #include "print-tree.h" #include "transaction.h" #include "list.h" -#include "version.h" #include "volumes.h" #include "utils.h" diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c index a361bf46..29ddeb9a 100644 --- a/btrfs-corrupt-block.c +++ b/btrfs-corrupt-block.c @@ -28,7 +28,6 @@ #include "print-tree.h" #include "transaction.h" #include "list.h" -#include "version.h" #include "utils.h" #define FIELD_BUF_LEN 80 diff --git a/btrfs-debug-tree.c b/btrfs-debug-tree.c index 0815fe1e..10d02974 100644 --- a/btrfs-debug-tree.c +++ b/btrfs-debug-tree.c @@ -26,7 +26,6 @@ #include "disk-io.h" #include "print-tree.h" #include "transaction.h" -#include "version.h" #include "utils.h" static int print_usage(void) @@ -43,7 +42,7 @@ static int print_usage(void) " only\n"); fprintf(stderr, "\t-t tree_id : print only the tree with the given id\n"); - fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION); + fprintf(stderr, "%s\n", PACKAGE_STRING); exit(1); } @@ -413,7 +412,7 @@ no_node: uuidbuf[BTRFS_UUID_UNPARSED_SIZE - 1] = '\0'; uuid_unparse(info->super_copy->fsid, uuidbuf); printf("uuid %s\n", uuidbuf); - printf("%s\n", BTRFS_BUILD_VERSION); + printf("%s\n", PACKAGE_STRING); close_root: return close_ctree(root); } diff --git a/btrfs-find-root.c b/btrfs-find-root.c index 35171078..3edb8332 100644 --- a/btrfs-find-root.c +++ b/btrfs-find-root.c @@ -28,7 +28,6 @@ #include "print-tree.h" #include "transaction.h" #include "list.h" -#include "version.h" #include "volumes.h" #include "utils.h" #include "crc32c.h" diff --git a/btrfs-image.c b/btrfs-image.c index 6a37fd93..73dbfcdc 100644 --- a/btrfs-image.c +++ b/btrfs-image.c @@ -31,7 +31,6 @@ #include "disk-io.h" #include "transaction.h" #include "utils.h" -#include "version.h" #include "volumes.h" #include "extent_io.h" diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c index 0612c68b..fc8ce46f 100644 --- a/btrfs-map-logical.c +++ b/btrfs-map-logical.c @@ -28,7 +28,6 @@ #include "print-tree.h" #include "transaction.h" #include "list.h" -#include "version.h" #include "utils.h" /* we write the mirror info to stdout unless they are dumping the data diff --git a/btrfs-select-super.c b/btrfs-select-super.c index 063ffa37..b790f3e2 100644 --- a/btrfs-select-super.c +++ b/btrfs-select-super.c @@ -27,13 +27,12 @@ #include "print-tree.h" #include "transaction.h" #include "list.h" -#include "version.h" #include "utils.h" static void print_usage(void) { fprintf(stderr, "usage: btrfs-select-super -s number dev\n"); - fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION); + fprintf(stderr, "%s\n", PACKAGE_STRING); exit(1); } diff --git a/btrfs-show-super.c b/btrfs-show-super.c index 4afa8527..1c7a0867 100644 --- a/btrfs-show-super.c +++ b/btrfs-show-super.c @@ -31,7 +31,6 @@ #include "print-tree.h" #include "transaction.h" #include "list.h" -#include "version.h" #include "utils.h" #include "crc32c.h" @@ -49,7 +48,7 @@ static void print_usage(void) fprintf(stderr, "\t-a : print information of all superblocks\n"); fprintf(stderr, "\t-i <super_mirror> : specify which mirror to print out\n"); fprintf(stderr, "\t-F : attempt to dump superblocks with bad magic\n"); - fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION); + fprintf(stderr, "%s\n", PACKAGE_STRING); } int main(int argc, char **argv) diff --git a/btrfs-zero-log.c b/btrfs-zero-log.c index 31e7481f..cd0cee01 100644 --- a/btrfs-zero-log.c +++ b/btrfs-zero-log.c @@ -27,14 +27,13 @@ #include "print-tree.h" #include "transaction.h" #include "list.h" -#include "version.h" #include "utils.h" static void print_usage(void) __attribute__((noreturn)); static void print_usage(void) { fprintf(stderr, "usage: btrfs-zero-log dev\n"); - fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION); + fprintf(stderr, "%s\n", PACKAGE_STRING); exit(1); } @@ -20,7 +20,6 @@ #include "crc32c.h" #include "commands.h" -#include "version.h" #include "utils.h" static const char * const btrfs_cmd_group_usage[] = { @@ -168,7 +167,7 @@ static const char * const cmd_version_usage[] = { static int cmd_version(int argc, char **argv) { - printf("%s\n", BTRFS_BUILD_VERSION); + printf("%s\n", PACKAGE_STRING); return 0; } diff --git a/btrfstune.c b/btrfstune.c index ac9f3110..808466f9 100644 --- a/btrfstune.c +++ b/btrfstune.c @@ -28,7 +28,6 @@ #include "disk-io.h" #include "transaction.h" #include "utils.h" -#include "version.h" static char *device; static int force = 0; diff --git a/chunk-recover.c b/chunk-recover.c index 89219d2f..94efc438 100644 --- a/chunk-recover.c +++ b/chunk-recover.c @@ -36,7 +36,6 @@ #include "transaction.h" #include "crc32c.h" #include "utils.h" -#include "version.h" #include "btrfsck.h" #include "commands.h" diff --git a/cmds-check.c b/cmds-check.c index 68863707..ddf712ee 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -31,7 +31,6 @@ #include "disk-io.h" #include "print-tree.h" #include "transaction.h" -#include "version.h" #include "utils.h" #include "commands.h" #include "free-space-cache.h" @@ -8749,7 +8748,7 @@ out: printf("file data blocks allocated: %llu\n referenced %llu\n", (unsigned long long)data_bytes_allocated, (unsigned long long)data_bytes_referenced); - printf("%s\n", BTRFS_BUILD_VERSION); + printf("%s\n", PACKAGE_STRING); free_root_recs_tree(&root_cache); close_out: diff --git a/cmds-filesystem.c b/cmds-filesystem.c index 9aa57146..f3fc160c 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -33,7 +33,6 @@ #include "ioctl.h" #include "utils.h" #include "volumes.h" -#include "version.h" #include "commands.h" #include "cmds-fi-disk_usage.h" #include "list_sort.h" @@ -957,7 +956,7 @@ devs_only: free_fs_devices(fs_devices); } out: - printf("%s\n", BTRFS_BUILD_VERSION); + printf("%s\n", PACKAGE_STRING); free_seen_fsid(); return ret; } @@ -1213,7 +1212,7 @@ static int cmd_defrag(int argc, char **argv) } } if (defrag_global_verbose) - printf("%s\n", BTRFS_BUILD_VERSION); + printf("%s\n", PACKAGE_STRING); if (defrag_global_errors) fprintf(stderr, "total %d failures\n", defrag_global_errors); diff --git a/cmds-restore.c b/cmds-restore.c index d2fc9517..dce6d7be 100644 --- a/cmds-restore.c +++ b/cmds-restore.c @@ -39,7 +39,6 @@ #include "print-tree.h" #include "transaction.h" #include "list.h" -#include "version.h" #include "volumes.h" #include "utils.h" #include "commands.h" @@ -41,7 +41,6 @@ #include "volumes.h" #include "transaction.h" #include "utils.h" -#include "version.h" static u64 index_cnt = 2; @@ -290,14 +289,14 @@ static void print_usage(void) fprintf(stderr, "\t -O --features comma separated list of filesystem features\n"); fprintf(stderr, "\t -U --uuid specify the filesystem UUID\n"); fprintf(stderr, "\t -V --version print the mkfs.btrfs version and exit\n"); - fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION); + fprintf(stderr, "%s\n", PACKAGE_STRING); exit(1); } static void print_version(void) __attribute__((noreturn)); static void print_version(void) { - fprintf(stderr, "mkfs.btrfs, part of %s\n", BTRFS_BUILD_VERSION); + fprintf(stderr, "mkfs.btrfs, part of %s\n", PACKAGE_STRING); exit(0); } @@ -1489,8 +1488,8 @@ int main(int ac, char **av) } /* if we are here that means all devs are good to btrfsify */ - printf("%s\n", BTRFS_BUILD_VERSION); - printf("See http://btrfs.wiki.kernel.org for more information.\n\n"); + printf("%s\n", PACKAGE_STRING); + printf("See %s for more information.\n\n", PACKAGE_URL); dev_cnt--; |