authfs: Remove Arc<Mutex<>> now that Strong is Sync
Bug: 191763370
Test: atest AuthFsHostTest
Change-Id: If090b1f29583691cec7135f711724f308a8abd02
diff --git a/authfs/src/main.rs b/authfs/src/main.rs
index d03e3ca..9d36c3f 100644
--- a/authfs/src/main.rs
+++ b/authfs/src/main.rs
@@ -32,7 +32,6 @@
use std::fs::File;
use std::io::Read;
use std::path::{Path, PathBuf};
-use std::sync::{Arc, Mutex};
use structopt::StructOpt;
mod auth;
@@ -224,15 +223,14 @@
) -> Result<FileConfig> {
let signature = service.readFsveritySignature(remote_id).context("Failed to read signature")?;
- let service = Arc::new(Mutex::new(service));
let authenticator = FakeAuthenticator::always_succeed();
Ok(FileConfig::RemoteVerifiedReadonlyFile {
reader: VerifiedFileReader::new(
&authenticator,
- RemoteFileReader::new(Arc::clone(&service), remote_id),
+ RemoteFileReader::new(service.clone(), remote_id),
file_size,
signature,
- RemoteMerkleTreeReader::new(Arc::clone(&service), remote_id),
+ RemoteMerkleTreeReader::new(service.clone(), remote_id),
)?,
file_size,
})
@@ -243,7 +241,7 @@
remote_id: i32,
file_size: u64,
) -> Result<FileConfig> {
- let reader = RemoteFileReader::new(Arc::new(Mutex::new(service)), remote_id);
+ let reader = RemoteFileReader::new(service, remote_id);
Ok(FileConfig::RemoteUnverifiedReadonlyFile { reader, file_size })
}
@@ -274,7 +272,7 @@
service: file::VirtFdService,
remote_id: i32,
) -> Result<FileConfig> {
- let remote_file = RemoteFileEditor::new(Arc::new(Mutex::new(service)), remote_id);
+ let remote_file = RemoteFileEditor::new(service, remote_id);
Ok(FileConfig::RemoteVerifiedNewFile { editor: VerifiedFileEditor::new(remote_file) })
}