[PATCH] [bcachefs-tools] Cosmetic fixes for device resize-journal

[PATCH] [bcachefs-tools] Cosmetic fixes for device resize-journal

[Chris Webb]

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 <chris@arachsys.com>
---
 bcachefs.c   | 2 +-
 cmd_device.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bcachefs.c b/bcachefs.c
index 1a06c17..2b004a0 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 3bdb281..87d8507 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");
 

Re: [PATCH] [bcachefs-tools] Cosmetic fixes for device resize-journal

[Kent Overstreet]

On Sun, Oct 24, 2021 at 01:52:32PM +0100, Chris Webb wrote:
> 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.

Applied, thanks!