From 1cbaa32809caeeea5ea940afcc4e28618fdd1410 Mon Sep 17 00:00:00 2001
From: Frederick Mayle <fmayle@google.com>
Date: Wed, 1 May 2024 11:34:05 -0700
Subject: [PATCH] base: delete PunchHoleMut trait

Was only needed for QcowFile, which can now use its internal mutex.

BUG=b:338274203

Change-Id: I995cf646a66909b9b146b9a7c0ff7d5a8348acd7
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5507755
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Frederick Mayle <fmayle@google.com>
---
 base/src/lib.rs          |  1 -
 base/src/write_zeroes.rs | 12 ------------
 disk/src/asynchronous.rs |  8 ++++----
 disk/src/qcow/mod.rs     | 15 ++++++---------
 4 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/base/src/lib.rs b/base/src/lib.rs
index 2b2151477b..7207de3ea1 100644
--- a/base/src/lib.rs
+++ b/base/src/lib.rs
@@ -80,7 +80,6 @@ pub use wait_context::TriggeredEvent;
 pub use wait_context::WaitContext;
 pub use worker_thread::WorkerThread;
 pub use write_zeroes::PunchHole;
-pub use write_zeroes::PunchHoleMut;
 pub use write_zeroes::WriteZeroesAt;
 
 // TODO(b/233233301): reorganize platform specific exports under platform
diff --git a/base/src/write_zeroes.rs b/base/src/write_zeroes.rs
index 6489afc694..e98410b07a 100644
--- a/base/src/write_zeroes.rs
+++ b/base/src/write_zeroes.rs
@@ -19,18 +19,6 @@ impl PunchHole for File {
     }
 }
 
-/// A trait for deallocating space in a file of a mutable reference
-pub trait PunchHoleMut {
-    /// Replace a range of bytes with a hole.
-    fn punch_hole_mut(&mut self, offset: u64, length: u64) -> io::Result<()>;
-}
-
-impl<T: PunchHole> PunchHoleMut for T {
-    fn punch_hole_mut(&mut self, offset: u64, length: u64) -> io::Result<()> {
-        self.punch_hole(offset, length)
-    }
-}
-
 /// A trait for writing zeroes to an arbitrary position in a file.
 pub trait WriteZeroesAt {
     /// Write up to `length` bytes of zeroes starting at `offset`, returning how many bytes were
diff --git a/disk/src/asynchronous.rs b/disk/src/asynchronous.rs
index 62471cb0ca..e2738f3a09 100644
--- a/disk/src/asynchronous.rs
+++ b/disk/src/asynchronous.rs
@@ -13,7 +13,7 @@ use base::AsRawDescriptors;
 use base::FileAllocate;
 use base::FileSetLen;
 use base::FileSync;
-use base::PunchHoleMut;
+use base::PunchHole;
 use base::RawDescriptor;
 use base::WriteZeroesAt;
 use cros_async::BackingMemory;
@@ -84,7 +84,7 @@ impl<
             + FileAllocate
             + FileSetLen
             + FileSync
-            + PunchHoleMut
+            + PunchHole
             + WriteZeroesAt,
     > AsyncDisk for AsyncDiskFileWrapper<T>
 {
@@ -186,9 +186,9 @@ impl<
         let inner_clone = self.inner.clone();
         self.blocking_pool
             .spawn(move || {
-                let mut disk_file = inner_clone.lock();
+                let disk_file = inner_clone.lock();
                 disk_file
-                    .punch_hole_mut(file_offset, length)
+                    .punch_hole(file_offset, length)
                     .map_err(Error::IoPunchHole)
             })
             .await
diff --git a/disk/src/qcow/mod.rs b/disk/src/qcow/mod.rs
index 7b1670b9fb..59ed62eeaa 100644
--- a/disk/src/qcow/mod.rs
+++ b/disk/src/qcow/mod.rs
@@ -27,7 +27,7 @@ use base::FileAllocate;
 use base::FileReadWriteAtVolatile;
 use base::FileSetLen;
 use base::FileSync;
-use base::PunchHoleMut;
+use base::PunchHole;
 use base::RawDescriptor;
 use base::VolatileMemory;
 use base::VolatileSlice;
@@ -1244,10 +1244,7 @@ impl QcowFileInner {
             // This cluster is no longer in use; deallocate the storage.
             // The underlying FS may not support FALLOC_FL_PUNCH_HOLE,
             // so don't treat an error as fatal.  Future reads will return zeros anyways.
-            let _ = self
-                .raw_file
-                .file_mut()
-                .punch_hole_mut(cluster_addr, cluster_size);
+            let _ = self.raw_file.file().punch_hole(cluster_addr, cluster_size);
             self.unref_clusters.push(cluster_addr);
         }
         Ok(())
@@ -1617,9 +1614,9 @@ impl FileAllocate for QcowFile {
     }
 }
 
-impl PunchHoleMut for QcowFile {
-    fn punch_hole_mut(&mut self, offset: u64, length: u64) -> std::io::Result<()> {
-        let inner = self.inner.get_mut();
+impl PunchHole for QcowFile {
+    fn punch_hole(&self, offset: u64, length: u64) -> std::io::Result<()> {
+        let mut inner = self.inner.lock();
         let mut remaining = length;
         let mut offset = offset;
         while remaining > 0 {
@@ -1634,7 +1631,7 @@ impl PunchHoleMut for QcowFile {
 
 impl WriteZeroesAt for QcowFile {
     fn write_zeroes_at(&mut self, offset: u64, length: usize) -> io::Result<usize> {
-        self.punch_hole_mut(offset, length as u64)?;
+        self.punch_hole(offset, length as u64)?;
         Ok(length)
     }
 }