android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ksud: remove journal for ext4 images

Browse Source
This commit is contained in:
weishu
2025-02-17 20:22:12 +08:00
parent 4ac180754f
commit 4ede20ef83
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
userspace/ksud/src/module.rs
View File

@@ -294,7 +294,7 @@ pub fn prune_modules() -> Result<()> {
Ok(()) Ok(())
} }
fn create_module_image(image: &str, image_size: u64, journal_size: u64) -> Result<()> { fn create_module_image(image: &str, image_size: u64) -> Result<()> {
File::create(image) File::create(image)
.context("Failed to create ext4 image file")? .context("Failed to create ext4 image file")?
.set_len(image_size) .set_len(image_size)
@@ -302,8 +302,8 @@ fn create_module_image(image: &str, image_size: u64, journal_size: u64) -> Resul
// format the img to ext4 filesystem // format the img to ext4 filesystem
let result = Command::new("mkfs.ext4") let result = Command::new("mkfs.ext4")
.arg("-J") .arg("-O")
.arg(format!("size={journal_size}")) .arg("^has_journal")
.arg(image) .arg(image)
.stdout(Stdio::piped()) .stdout(Stdio::piped())
.output()?; .output()?;
@@ -315,6 +315,7 @@ fn create_module_image(image: &str, image_size: u64, journal_size: u64) -> Resul
check_image(image)?; check_image(image)?;
Ok(()) Ok(())
} }
fn _install_module(zip: &str) -> Result<()> { fn _install_module(zip: &str) -> Result<()> {
ensure_boot_completed()?; ensure_boot_completed()?;
@@ -375,12 +376,11 @@ fn _install_module(zip: &str) -> Result<()> {
); );
let sparse_image_size = 1 << 40; // 1T let sparse_image_size = 1 << 40; // 1T
let journal_size = 8; // 8M
if !modules_img_exist && !modules_update_img_exist { if !modules_img_exist && !modules_update_img_exist {
// if no modules and modules_update, it is brand new installation, we should create a new img // if no modules and modules_update, it is brand new installation, we should create a new img
// create a tmp module img and mount it to modules_update // create a tmp module img and mount it to modules_update
info!("Creating brand new module image"); info!("Creating brand new module image");
create_module_image(tmp_module_img, sparse_image_size, journal_size)?; create_module_image(tmp_module_img, sparse_image_size)?;
} else if modules_update_img_exist { } else if modules_update_img_exist {
// modules_update.img exists, we should use it as tmp img // modules_update.img exists, we should use it as tmp img
info!("Using existing modules_update.img as tmp image"); info!("Using existing modules_update.img as tmp image");
@@ -402,7 +402,7 @@ fn _install_module(zip: &str) -> Result<()> {
// legacy image, it's block size is 1024 with unlimited journal size // legacy image, it's block size is 1024 with unlimited journal size
if blksize == 1024 { if blksize == 1024 {
println!("- Legacy image, migrating to new format, please be patient..."); println!("- Legacy image, migrating to new format, please be patient...");
create_module_image(tmp_module_img, sparse_image_size, journal_size)?; create_module_image(tmp_module_img, sparse_image_size)?;
let _dontdrop = let _dontdrop =
mount::AutoMountExt4::try_new(tmp_module_img, module_update_tmp_dir, true) mount::AutoMountExt4::try_new(tmp_module_img, module_update_tmp_dir, true)
.with_context(|| format!("Failed to mount {tmp_module_img}"))?; .with_context(|| format!("Failed to mount {tmp_module_img}"))?;