Remove unnecessary FFI

topjohnwu · Feb 14, 2025 · 540253a · 540253a
1 parent 15b7c4c
commit 540253a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/native/src/core/daemon.rs b/native/src/core/daemon.rs
@@ -6,7 +6,7 @@ use crate::ffi::{
 };
 use crate::get_prop;
 use crate::logging::{magisk_logging, setup_logfile, start_log_daemon};
-use crate::mount::setup_mounts;
+use crate::mount::{clean_mounts, setup_mounts};
 use crate::package::ManagerInfo;
 use crate::su::SuInfo;
 use base::libc::{O_CLOEXEC, O_RDONLY};
@@ -150,6 +150,7 @@ impl MagiskD {
         setup_mounts();
         let modules = self.handle_modules();
         self.module_list.set(modules).ok();
+        clean_mounts();
 
         false
     }

diff --git a/native/src/core/lib.rs b/native/src/core/lib.rs
@@ -13,7 +13,7 @@ use cxx::{type_id, ExternType};
 use daemon::{daemon_entry, MagiskD};
 use derive::Decodable;
 use logging::{android_logging, setup_logfile, zygisk_close_logd, zygisk_get_logd, zygisk_logging};
-use mount::{clean_mounts, find_preinit_device, revert_unmount};
+use mount::{find_preinit_device, revert_unmount};
 use resetprop::{persist_delete_prop, persist_get_prop, persist_get_props, persist_set_prop};
 use socket::{recv_fd, recv_fds, send_fd, send_fds};
 use std::fs::File;
@@ -192,7 +192,6 @@ pub mod ffi {
         fn zygisk_close_logd();
         fn zygisk_get_logd() -> i32;
         fn setup_logfile();
-        fn clean_mounts();
         fn find_preinit_device() -> String;
         fn revert_unmount(pid: i32);
         fn zygisk_should_load_module(flags: u32) -> bool;

diff --git a/native/src/core/module.cpp b/native/src/core/module.cpp
@@ -341,9 +341,6 @@ static void load_modules(bool zygisk_enabled, const rust::Vec<ModuleInfo> &modul
         root->prepare();
         root->mount();
     }
-
-    // cleanup mounts
-    clean_mounts();
 }
 
 /************************