include/linux/bitmap.h: inline __bitmap_weight and __bitmap_and

[bcachefs-tools-debian] / bcachefs.c

diff --git a/bcachefs.c b/bcachefs.c
index 8408c29735e66b30ef8f92c1280207efaad67bbe..53806f39f15ad42d5bf5ef3c27a0feebdc1cb469 100644 (file)
--- a/bcachefs.c
+++ b/bcachefs.c
@@ -53,6 +53,9 @@ static void usage(void)
             "  device set-state     Mark a device as failed\n"
             "  device resize        Resize filesystem on a device\n"
             "\n"
+            "Commands for managing filesystem data:\n"
+            "  data rereplicate     Rereplicate degraded data\n"
+            "\n"
             "Encryption:\n"
             "  unlock               Unlock an encrypted filesystem prior to running/mounting\n"
             "  set-passphrase       Change passphrase on an existing (unmounted) filesystem\n"
@@ -110,7 +113,7 @@ static int device_cmds(int argc, char *argv[])
        if (!strcmp(cmd, "offline"))
                return cmd_device_offline(argc, argv);
        if (!strcmp(cmd, "evacuate"))
-               return cmd_device_offline(argc, argv);
+               return cmd_device_evacuate(argc, argv);
        if (!strcmp(cmd, "set-state"))
                return cmd_device_set_state(argc, argv);
        if (!strcmp(cmd, "resize"))
@@ -120,6 +123,17 @@ static int device_cmds(int argc, char *argv[])
        return 0;
 }
 
+static int data_cmds(int argc, char *argv[])
+{
+       char *cmd = pop_cmd(&argc, argv);
+
+       if (!strcmp(cmd, "rereplicate"))
+               return cmd_data_rereplicate(argc, argv);
+
+       usage();
+       return 0;
+}
+
 int main(int argc, char *argv[])
 {
        full_cmd = argv[0];
@@ -151,6 +165,9 @@ int main(int argc, char *argv[])
        if (!strcmp(cmd, "device"))
                return device_cmds(argc, argv);
 
+       if (!strcmp(cmd, "data"))
+               return data_cmds(argc, argv);
+
        if (!strcmp(cmd, "unlock"))
                return cmd_unlock(argc, argv);
        if (!strcmp(cmd, "set-passphrase"))