bcachefs-tools: add fs_usage & return -EINVAL when no matching subcommand
PATCH RESEND v2 1/1 bcachefs-tools: add fs_usage & return -EINVAL when no matching subcommand
Add the missing usage function for "fs" subcommand; when no matching subcommand exists, print the usage and return -EINVAL.
--- c_src/bcachefs.c | 15 ++++++++------- c_src/cmd_fs.c | 13 +++++++++++++ c_src/cmds.h | 1 + 3 files changed, 22 insertions(+), 7 deletions(-)
c_src/bcachefs.c +8 -7
@@ -118,16 +118,15 @@ int fs_cmds(int argc, char *argv[]) {char *cmd =pop_cmd (&argc, argv); -if (argc <1 ) { -bcachefs_usage (); -exit (EXIT_FAILURE ); - } +if (argc <1 ) +return fs_usage ();if (!strcmp (cmd,"usage" ))return cmd_fs_usage (argc, argv);if (!strcmp (cmd,"top" ))return cmd_fs_top (argc, argv); -return 0 ; +fs_usage (); +return -EINVAL ; }int device_cmds (int argc,char *argv[])
@@ -153,7 +152,8 @@ int device_cmds(int argc, char *argv[])if (!strcmp (cmd,"resize-journal" ))return cmd_device_resize_journal (argc, argv); -return 0 ; +device_usage (); +return -EINVAL ; }int data_cmds (int argc,char *argv[])
@@ -169,5 +169,6 @@ int data_cmds(int argc, char *argv[])if (!strcmp (cmd,"job" ))return cmd_data_job (argc, argv); -return 0 ; +data_usage (); +return -EINVAL ; }
c_src/cmd_fs.c +13 -0
@@ -491,6 +491,19 @@ devs:bcache_fs_close (fs); } +int fs_usage (void ) +{ +puts ("bcachefs fs - manage a running filesystem\n" +"Usage: bcachefs fs <CMD> [OPTIONS]\n" +"\n" +"Commands:\n" +" usage Display detailed filesystem usage\n" +" top Show runtime performance information\n" +"\n" +"Report bugs to <[email protected]>" ); +return 0 ; +} +static void fs_usage_usage (void ) { puts("bcachefs fs usage - display detailed filesystem usage\n"
c_src/cmds.h +1 -0
@@ -15,6 +15,7 @@ int cmd_recover_super(int argc, char *argv[]);int cmd_reset_counters (int argc,char *argv[]);int cmd_set_option (int argc,char *argv[]); +int fs_usage (void );int cmd_fs_usage (int argc,char *argv[]);int cmd_fs_top (int argc,char *argv[]);
Signature · 1 line
2.49.0
Quoted 4 lines · Integral
Add the missing usage function for "fs" subcommand; when no matching subcommand exists, print the usage and return
-EINVAL.Signed-off-by Integral <[email protected]>
I'm applying this. But -
We don't want to be adding more references to standard error codes. This is ok for now only because it's in -tools, and we haven't started ripping out standard error codes there yet.
But using the same standard error codes everywhere is a nightmore for debugging - "I got -EINVAL, but where did it come from?"
In the future we'll want to extend errcode.h instead (and split that up into two files, so that -tools doesn't have to add its error codes to the file it pulls from the kernel).
These ones are unlikely to cause problems, but it's a hygeine issue; the first thing I do when I get a "where did that error code come from?" bug report is go through and replace all instances of that error code with private ones.
Quoted 88 lines
--- c_src/bcachefs.c | 15 ++++++++------- c_src/cmd_fs.c | 13 +++++++++++++ c_src/cmds.h | 1 + 3 files changed, 22 insertions(+), 7 deletions(-)c_src/bcachefs.c +8
-7@@ -118,16 +118,15 @@ int fs_cmds(int argc, char *argv[]) {char *cmd =pop_cmd (&argc, argv); -if (argc <1 ) { -bcachefs_usage (); -exit (EXIT_FAILURE ); - } +if (argc <1 ) +return fs_usage ();if (!strcmp (cmd,"usage" ))return cmd_fs_usage (argc, argv);if (!strcmp (cmd,"top" ))return cmd_fs_top (argc, argv); -return 0 ; +fs_usage (); +return -EINVAL ; }int device_cmds (int argc,char *argv[])@@ -153,7 +152,8 @@ int device_cmds(int argc, char *argv[])if (!strcmp (cmd,"resize-journal" ))return cmd_device_resize_journal (argc, argv); -return 0 ; +device_usage (); +return -EINVAL ; }int data_cmds (int argc,char *argv[])@@ -169,5 +169,6 @@ int data_cmds(int argc, char *argv[])if (!strcmp (cmd,"job" ))return cmd_data_job (argc, argv); -return 0 ; +data_usage (); +return -EINVAL ; }c_src/cmd_fs.c +13
-0@@ -491,6 +491,19 @@ devs:bcache_fs_close (fs); } +int fs_usage (void ) +{ +puts ("bcachefs fs - manage a running filesystem\n" +"Usage: bcachefs fs <CMD> [OPTIONS]\n" +"\n" +"Commands:\n" +" usage Display detailed filesystem usage\n" +" top Show runtime performance information\n" +"\n" +"Report bugs to <[email protected]>" ); +return 0 ; +} +static void fs_usage_usage (void ) { puts("bcachefs fs usage - display detailed filesystem usage\n"c_src/cmds.h +1
-0@@ -15,6 +15,7 @@ int cmd_recover_super(int argc, char *argv[]);int cmd_reset_counters (int argc,char *argv[]);int cmd_set_option (int argc,char *argv[]); +int fs_usage (void );int cmd_fs_usage (int argc,char *argv[]);int cmd_fs_top (int argc,char *argv[]);Signature · 1 line
2.49.0
Quoted 4 lines · Integral
Add the missing usage function for "fs" subcommand; when no matching subcommand exists, print the usage and return
-EINVAL.Signed-off-by Integral <[email protected]>
err, you sent me duplicates?
Quoted 88 lines
--- c_src/bcachefs.c | 15 ++++++++------- c_src/cmd_fs.c | 13 +++++++++++++ c_src/cmds.h | 1 + 3 files changed, 22 insertions(+), 7 deletions(-)c_src/bcachefs.c +8
-7@@ -118,16 +118,15 @@ int fs_cmds(int argc, char *argv[]) {char *cmd =pop_cmd (&argc, argv); -if (argc <1 ) { -bcachefs_usage (); -exit (EXIT_FAILURE ); - } +if (argc <1 ) +return fs_usage ();if (!strcmp (cmd,"usage" ))return cmd_fs_usage (argc, argv);if (!strcmp (cmd,"top" ))return cmd_fs_top (argc, argv); -return 0 ; +fs_usage (); +return -EINVAL ; }int device_cmds (int argc,char *argv[])@@ -153,7 +152,8 @@ int device_cmds(int argc, char *argv[])if (!strcmp (cmd,"resize-journal" ))return cmd_device_resize_journal (argc, argv); -return 0 ; +device_usage (); +return -EINVAL ; }int data_cmds (int argc,char *argv[])@@ -169,5 +169,6 @@ int data_cmds(int argc, char *argv[])if (!strcmp (cmd,"job" ))return cmd_data_job (argc, argv); -return 0 ; +data_usage (); +return -EINVAL ; }c_src/cmd_fs.c +13
-0@@ -491,6 +491,19 @@ devs:bcache_fs_close (fs); } +int fs_usage (void ) +{ +puts ("bcachefs fs - manage a running filesystem\n" +"Usage: bcachefs fs <CMD> [OPTIONS]\n" +"\n" +"Commands:\n" +" usage Display detailed filesystem usage\n" +" top Show runtime performance information\n" +"\n" +"Report bugs to <[email protected]>" ); +return 0 ; +} +static void fs_usage_usage (void ) { puts("bcachefs fs usage - display detailed filesystem usage\n"c_src/cmds.h +1
-0@@ -15,6 +15,7 @@ int cmd_recover_super(int argc, char *argv[]);int cmd_reset_counters (int argc,char *argv[]);int cmd_set_option (int argc,char *argv[]); +int fs_usage (void );int cmd_fs_usage (int argc,char *argv[]);int cmd_fs_top (int argc,char *argv[]);Signature · 1 line
2.49.0