From 0de1fb41b7bc97fabda78e5416a600a723a51c3d Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 10 Aug 2023 15:22:25 +0200
Subject: [PATCH] cmd_mount: don't return 0 on mount failure
Signed-off-by: Linus Heckemann <git@sphalerite.org>
---
bcachefs.c | 3 +--
cmds.h | 2 +-
rust-src/src/cmd_mount.rs | 6 ++++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/bcachefs.c b/bcachefs.c
index 750e11db..e0e20458 100644
--- a/bcachefs.c
+++ b/bcachefs.c
@@ -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
diff --git a/cmds.h b/cmds.h
index 96216b21..8b567953 100644
--- a/cmds.h
+++ b/cmds.h
@@ -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
}
}