alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

cmd_device_remove: allow removal by device id

Browse Source 
If a disk is absent, there is no way to remove it from the filesystem.
Add the possibility to remove devices by id, to allow removal of missing
disks.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
This commit is contained in:
Stijn Tintel 2019-08-16 20:24:11 +03:00
parent 692eadd6ca
commit e57c053797
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd_device.c
View File

@ -120,9 +120,12 @@ int cmd_device_add(int argc, char *argv[])
static void device_remove_usage(void) static void device_remove_usage(void)
{ {
puts("bcachefs device_remove - remove a device from a filesystem\n" puts("bcachefs device_remove - remove a device from a filesystem\n"
"Usage: bcachefs device remove device\n" "Usage:\n"
" bcachefs device remove device\n"
" bcachefs device remove --by-id path devid\n"
"\n" "\n"
"Options:\n" "Options:\n"
" -i, --by-id Remove device by device id\n"
" -f, --force Force removal, even if some data\n" " -f, --force Force removal, even if some data\n"
" couldn't be migrated\n" " couldn't be migrated\n"
" -F, --force-metadata Force removal, even if some metadata\n" " -F, --force-metadata Force removal, even if some metadata\n"
@ -135,15 +138,22 @@ static void device_remove_usage(void)
int cmd_device_remove(int argc, char *argv[]) int cmd_device_remove(int argc, char *argv[])
{ {
static const struct option longopts[] = { static const struct option longopts[] = {
{ "by-id", 0, NULL, 'i' },
{ "force", 0, NULL, 'f' }, { "force", 0, NULL, 'f' },
{ "force-metadata", 0, NULL, 'F' }, { "force-metadata", 0, NULL, 'F' },
{ "help", 0, NULL, 'h' }, { "help", 0, NULL, 'h' },
{ NULL } { NULL }
}; };
struct bchfs_handle fs;
bool by_id = false;
int opt, flags = BCH_FORCE_IF_DEGRADED; int opt, flags = BCH_FORCE_IF_DEGRADED;
unsigned dev_idx;
while ((opt = getopt_long(argc, argv, "fh", longopts, NULL)) != -1) while ((opt = getopt_long(argc, argv, "fh", longopts, NULL)) != -1)
switch (opt) { switch (opt) {
case 'i':
by_id = true;
break;
case 'f': case 'f':
flags |= BCH_FORCE_IF_DATA_LOST; flags |= BCH_FORCE_IF_DATA_LOST;
break; break;
@ -155,15 +165,27 @@ int cmd_device_remove(int argc, char *argv[])
} }
args_shift(optind); args_shift(optind);
if (by_id) {
char *path = arg_pop();
if (!path)
die("Please supply filesystem to remove device from");
dev_idx = (intptr_t) arg_pop();
if (!dev_idx)
die("Please supply device id");
fs = bcache_fs_open(path);
} else {
char *dev = arg_pop(); char *dev = arg_pop();
if (!dev) if (!dev)
die("Please supply a device to remove"); die("Please supply a device to remove");
fs = bchu_fs_open_by_dev(dev, &dev_idx);
}
if (argc) if (argc)
die("too many arguments"); die("too many arguments");
unsigned dev_idx;
struct bchfs_handle fs = bchu_fs_open_by_dev(dev, &dev_idx);
bchu_disk_remove(fs, dev_idx, flags); bchu_disk_remove(fs, dev_idx, flags);
return 0; return 0;
} }