btrfs-progs: introduce global config

[platform/upstream/btrfs-progs.git] / utils.c

diff --git a/utils.c b/utils.c
index 06c90c7..1adcc84 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -63,6 +63,8 @@ static char argv0_buf[ARGV0_BUF_SIZE] = "btrfs";
 static int rand_seed_initlized = 0;
 static unsigned short rand_seed[3];
 
+struct btrfs_config bconf;
+
 const char *get_argv0_buf(void)
 {
        return argv0_buf;
@@ -943,7 +945,7 @@ out:
  *    Split into small blocks and reuse codes.
  *    TODO: Reuse tree operation facilities by introducing new flags
  */
-static int make_convert_btrfs(int fd, struct btrfs_mkfs_config *cfg,
+int make_convert_btrfs(int fd, struct btrfs_mkfs_config *cfg,
                              struct btrfs_convert_context *cctx)
 {
        struct cache_tree *free = &cctx->free;
@@ -1052,8 +1054,7 @@ out:
  * The superblock signature is not valid, denotes a partially created
  * filesystem, needs to be finalized.
  */
-int make_btrfs(int fd, struct btrfs_mkfs_config *cfg,
-               struct btrfs_convert_context *cctx)
+int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
 {
        struct btrfs_super_block super;
        struct extent_buffer *buf;
@@ -1078,8 +1079,6 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg,
                                 BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA);
        u64 num_bytes;
 
-       if (cctx)
-               return make_convert_btrfs(fd, cfg, cctx);
        buf = malloc(sizeof(*buf) + max(cfg->sectorsize, cfg->nodesize));
        if (!buf)
                return -ENOMEM;
@@ -1869,8 +1868,8 @@ int btrfs_prepare_device(int fd, const char *file, u64 *block_count_ret,
                 */
                if (discard_range(fd, 0, 0) == 0) {
                        if (opflags & PREP_DEVICE_VERBOSE)
-                               printf("Performing full device TRIM (%s) ...\n",
-                                               pretty_size(block_count));
+                               printf("Performing full device TRIM %s (%s) ...\n",
+                                               file, pretty_size(block_count));
                        discard_blocks(fd, 0, block_count);
                }
        }
@@ -4290,3 +4289,7 @@ unsigned int rand_range(unsigned int upper)
         */
        return (unsigned int)(jrand48(rand_seed) % upper);
 }
+
+void btrfs_config_init(void)
+{
+}