Update bcachefs sources to fd6fb298aa bcachefs: Make sure hash info gets initialized...

[bcachefs-tools-debian] / cmd_format.c

diff --git a/cmd_format.c b/cmd_format.c
index e57553d862ac417717e96d1044dec6138546b057..26a1cd9f725837cb50b5b82d42339b91453220b7 100644 (file)
--- a/cmd_format.c
+++ b/cmd_format.c
@@ -20,11 +20,11 @@
 
 #include <uuid/uuid.h>
 
-#include "ccan/darray/darray.h"
-
 #include "cmds.h"
 #include "libbcachefs.h"
 #include "crypto.h"
+#include "libbcachefs/darray.h"
+#include "libbcachefs/errcode.h"
 #include "libbcachefs/opts.h"
 #include "libbcachefs/super-io.h"
 #include "libbcachefs/util.h"
@@ -46,6 +46,7 @@ x(0,  version,                required_argument)      \
 x(0,   no_initialize,          no_argument)            \
 x('f', force,                  no_argument)            \
 x('q', quiet,                  no_argument)            \
+x('v', verbose,                no_argument)            \
 x('h', help,                   no_argument)
 
 static void usage(void)
@@ -73,12 +74,13 @@ static void usage(void)
             "\n"
             "  -f, --force\n"
             "  -q, --quiet                 Only print errors\n"
+            "  -v, --verbose               Verbose filesystem initialization\n"
             "  -h, --help                  Display this help and exit\n"
             "\n"
             "Device specific options must come before corresponding devices, e.g.\n"
             "  bcachefs format --label cache /dev/sdb /dev/sdc\n"
             "\n"
-            "Report bugs to <linux-bcache@vger.kernel.org>");
+            "Report bugs to <linux-bcachefs@vger.kernel.org>");
 }
 
 enum {
@@ -112,23 +114,20 @@ u64 read_flag_list_or_die(char *opt, const char * const list[],
 
 int cmd_format(int argc, char *argv[])
 {
-       darray(struct dev_opts) devices;
-       darray(char *) device_paths;
+       DARRAY(struct dev_opts) devices = { 0 };
+       DARRAY(char *) device_paths = { 0 };
        struct format_opts opts = format_opts_default();
        struct dev_opts dev_opts = dev_opts_default(), *dev;
-       bool force = false, no_passphrase = false, quiet = false, initialize = true;
+       bool force = false, no_passphrase = false, quiet = false, initialize = true, verbose = false;
        unsigned v;
        int opt;
 
-       darray_init(devices);
-       darray_init(device_paths);
-
        struct bch_opt_strs fs_opt_strs =
                bch2_cmdline_opts_get(&argc, argv, OPT_FORMAT);
        struct bch_opts fs_opts = bch2_parse_opts(fs_opt_strs);
 
        while ((opt = getopt_long(argc, argv,
-                                 "-L:U:g:fqh",
+                                 "-L:U:g:fqhv",
                                  format_opts,
                                  NULL)) != -1)
                switch (opt) {
@@ -199,15 +198,17 @@ int cmd_format(int argc, char *argv[])
                        initialize = false;
                        break;
                case O_no_opt:
-                       darray_append(device_paths, optarg);
+                       darray_push(&device_paths, optarg);
                        dev_opts.path = optarg;
-                       darray_append(devices, dev_opts);
+                       darray_push(&devices, dev_opts);
                        dev_opts.size = 0;
                        break;
                case O_quiet:
                case 'q':
                        quiet = true;
                        break;
+               case 'v':
+                       verbose = true;
                case O_help:
                case 'h':
                        usage();
@@ -218,7 +219,10 @@ int cmd_format(int argc, char *argv[])
                        break;
                }
 
-       if (darray_empty(devices))
+       if (opts.version != bcachefs_metadata_version_current)
+               initialize = false;
+
+       if (!devices.nr)
                die("Please supply a device");
 
        if (opts.encrypted && !no_passphrase) {
@@ -226,24 +230,25 @@ int cmd_format(int argc, char *argv[])
                initialize = false;
        }
 
-       darray_foreach(dev, devices)
+       darray_for_each(devices, dev)
                dev->fd = open_for_format(dev->path, force);
 
        struct bch_sb *sb =
                bch2_format(fs_opt_strs,
                            fs_opts,
                            opts,
-                           devices.item, darray_size(devices));
+                           devices.data, devices.nr);
        bch2_opt_strs_free(&fs_opt_strs);
 
        if (!quiet) {
-               char buf[4096];
-               struct printbuf out = PBUF(buf);
+               struct printbuf buf = PRINTBUF;
 
-               out.units = PRINTBUF_UNITS_HUMAN_READABLE;
+               buf.human_readable_units = true;
 
-               bch2_sb_to_text(&PBUF(buf), sb, false, 1 << BCH_SB_FIELD_members);
-               printf("%s", buf);
+               bch2_sb_to_text(&buf, sb, false, 1 << BCH_SB_FIELD_members);
+               printf("%s", buf.buf);
+
+               printbuf_exit(&buf);
        }
        free(sb);
 
@@ -252,24 +257,29 @@ int cmd_format(int argc, char *argv[])
                free(opts.passphrase);
        }
 
-       darray_free(devices);
+       darray_exit(&devices);
 
        if (initialize) {
+               struct bch_opts mount_opts = bch2_opts_empty();
+
+
+               opt_set(mount_opts, verbose, verbose);
+
                /*
                 * Start the filesystem once, to allocate the journal and create
                 * the root directory:
                 */
-               struct bch_fs *c = bch2_fs_open(device_paths.item,
-                                               darray_size(device_paths),
-                                               bch2_opts_empty());
+               struct bch_fs *c = bch2_fs_open(device_paths.data,
+                                               device_paths.nr,
+                                               mount_opts);
                if (IS_ERR(c))
-                       die("error opening %s: %s", device_paths.item[0],
-                           strerror(-PTR_ERR(c)));
+                       die("error opening %s: %s", device_paths.data[0],
+                           bch2_err_str(PTR_ERR(c)));
 
                bch2_fs_stop(c);
        }
 
-       darray_free(device_paths);
+       darray_exit(&device_paths);
 
        return 0;
 }
@@ -283,7 +293,7 @@ static void show_super_usage(void)
             "  -f, --fields=(fields)       list of sections to print\n"
             "  -l, --layout                print superblock layout\n"
             "  -h, --help                  display this help and exit\n"
-            "Report bugs to <linux-bcache@vger.kernel.org>");
+            "Report bugs to <linux-bcachefs@vger.kernel.org>");
        exit(EXIT_SUCCESS);
 }
 
@@ -330,16 +340,16 @@ int cmd_show_super(int argc, char *argv[])
        struct bch_sb_handle sb;
        int ret = bch2_read_super(dev, &opts, &sb);
        if (ret)
-               die("Error opening %s: %s", dev, strerror(-ret));
+               die("Error opening %s: %s", dev, bch2_err_str(ret));
 
-       char buf[4096 << 2];
-       struct printbuf out = PBUF(buf);
+       struct printbuf buf = PRINTBUF;
 
-       out.units = PRINTBUF_UNITS_HUMAN_READABLE;
+       buf.human_readable_units = true;
 
-       bch2_sb_to_text(&PBUF(buf), sb.sb, print_layout, fields);
-       printf("%s", buf);
+       bch2_sb_to_text(&buf, sb.sb, print_layout, fields);
+       printf("%s", buf.buf);
 
        bch2_free_super(&sb);
+       printbuf_exit(&buf);
        return 0;
 }