From f5c0b67603b2b31b010ccff58a8c0ea0bfed3a7f Mon Sep 17 00:00:00 2001 From: Chris Webb Date: Sun, 24 Oct 2021 13:52:32 +0100 Subject: [PATCH] Cosmetic fixes for device resize-journal Correct the operation name from 'journal-resize' to 'resize-journal' in the bcachefs usage summary, matching the command that is actually implemented. Fix the size argument so it isn't optional. Defaulting to the entire device makes sense for 'device resize', to automatically expand the fs to fill the block device. However, it is never meaningful (or possible) to expand the journal to the full disk. Signed-off-by: Chris Webb --- bcachefs.c | 2 +- cmd_device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bcachefs.c b/bcachefs.c index 1a06c171..2b004a01 100644 --- a/bcachefs.c +++ b/bcachefs.c @@ -56,7 +56,7 @@ static void usage(void) " device evacuate Migrate data off of a specific device\n" " device set-state Mark a device as failed\n" " device resize Resize filesystem on a device\n" - " device journal-resize Resize journal on a device\n" + " device resize-journal Resize journal on a device\n" "\n" "Commands for managing subvolumes and snapshots:\n" " subvolume create Create a new subvolume\n" diff --git a/cmd_device.c b/cmd_device.c index 3bdb2817..87d85074 100644 --- a/cmd_device.c +++ b/cmd_device.c @@ -539,7 +539,7 @@ int cmd_device_resize(int argc, char *argv[]) static void device_resize_journal_usage(void) { puts("bcachefs device resize-journal \n" - "Usage: bcachefs device resize-journal device [ size ]\n" + "Usage: bcachefs device resize-journal device size\n" "\n" "Options:\n" " -h, --help display this help and exit\n" @@ -571,7 +571,7 @@ int cmd_device_resize_journal(int argc, char *argv[]) char *size_arg = arg_pop(); if (!size_arg) - size = get_size(dev, dev_fd); + die("Please supply a journal size"); else if (bch2_strtoull_h(size_arg, &size)) die("invalid size");