diff options
author | Linus Heckemann <git@sphalerite.org> | 2023-08-10 15:22:25 +0200 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-08-10 11:01:24 -0400 |
commit | 0de1fb41b7bc97fabda78e5416a600a723a51c3d (patch) | |
tree | 913d8c631c0f9480e1bdb07a313a27dd36e35425 | |
parent | 9d26fad2940cbf1d6838849085c9e6cf932a1c8d (diff) | |
download | bcachefs-tools-0de1fb41b7bc97fabda78e5416a600a723a51c3d.tar.gz |
cmd_mount: don't return 0 on mount failure
Signed-off-by: Linus Heckemann <git@sphalerite.org>
-rw-r--r-- | bcachefs.c | 3 | ||||
-rw-r--r-- | cmds.h | 2 | ||||
-rw-r--r-- | rust-src/src/cmd_mount.rs | 6 |
3 files changed, 6 insertions, 5 deletions
@@ -254,8 +254,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 @@ -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 */ diff --git a/rust-src/src/cmd_mount.rs b/rust-src/src/cmd_mount.rs index 0150ffd5..b79985d8 100644 --- a/rust-src/src/cmd_mount.rs +++ b/rust-src/src/cmd_mount.rs @@ -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(i as 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 } } |