cmd_mount: don't return 0 on mount failure
PATCH 1/1 cmd_mount: don't return 0 on mount failure
Signed-off-by Linus Heckemann <[email protected]>
--- bcachefs.c | 3 +-- cmds.h | 2 +- rust-src/src/cmd_mount.rs | 6 ++++-- 3 files changed, 6 insertions(+), 5 deletions(-)
bcachefs.c +1 -2
@@ -250,8 +250,7 @@ int main(int argc, char *argv[])return cmd_setattr (argc, argv);#ifndef BCACHEFS_NO_RUST if (!strcmp (cmd,"mount" )) { -cmd_mount (argc, argv); -return 0 ; +return cmd_mount (argc, argv); }#endif
cmds.h +1 -1
@@ -60,6 +60,6 @@ int cmd_subvolume_delete(int argc, char *argv[]);int cmd_subvolume_snapshot (int argc,char *argv[]);int cmd_fusemount (int argc,char *argv[]); -void cmd_mount (int agc,char *argv[]); +int cmd_mount (int agc,char *argv[]);#endif /* _CMDS_H */
rust-src/src/cmd_mount.rs +4 -2
@@ -219,14 +219,14 @@ fn cmd_mount_inner(opt: Cli) -> anyhow::Result<()> { }#[no_mangle] -pub extern "C" fn cmd_mount (argc:c_int , argv: *const *const c_char ) { +pub extern "C" fn cmd_mount (argc:c_int , argv: *const *const c_char ) ->c_int {let argv:Vec <_ > = (0 ..argc) .map (|i|unsafe {CStr ::from_ptr (*argv.add (ias usize )) }) .map (|i|OsStr ::from_bytes (i.to_bytes ())) .collect ();let opt =Cli ::parse_from (argv); - + log::set_boxed_logger (Box ::new (SimpleLogger )).unwrap ();// @TODO : more granular log levels via mount option
@@ -239,7 +239,9 @@ pub extern "C" fn cmd_mount(argc: c_int, argv: *const *const c_char) { colored::control::set_override (opt.colorize);if let Err (e) =cmd_mount_inner (opt) {error! ("Fatal error: {}" , e); +1 }else {info! ("Successfully mounted" ); +0 } }
Signature · 1 line
2.40.1
Kent Overstreet
AppliedQuoted 6 lines · Linus Heckemann
Signed-off-by Linus Heckemann <[email protected]>--- bcachefs.c | 3 +-- cmds.h | 2 +- rust-src/src/cmd_mount.rs | 6 ++++-- 3 files changed, 6 insertions(+), 5 deletions(-)
Thanks! Applied.