Small fix.

kaist-cp · Jan 28, 2021 · 220a53d · 220a53d
1 parent 027eea7
commit 220a53d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/kernel-rs/src/file.rs b/kernel-rs/src/file.rs
@@ -99,7 +99,7 @@ impl File {
         }
 
         match &self.typ {
-            FileType::Pipe { pipe } => unsafe { pipe.read(addr, usize::try_from(n).unwrap_or(0)) },
+            FileType::Pipe { pipe } => pipe.read(addr, usize::try_from(n).unwrap_or(0)),
             FileType::Inode { ip, off } => {
                 let mut ip = ip.deref().lock();
                 let curr_off = unsafe { *off.get() };
@@ -126,7 +126,7 @@ impl File {
         }
 
         match &self.typ {
-            FileType::Pipe { pipe } => unsafe { pipe.write(addr, usize::try_from(n).unwrap_or(0)) },
+            FileType::Pipe { pipe } => pipe.write(addr, usize::try_from(n).unwrap_or(0)),
             FileType::Inode { ip, off } => {
                 // write a few blocks at a time to avoid exceeding
                 // the maximum log transaction size, including

diff --git a/kernel-rs/src/pipe.rs b/kernel-rs/src/pipe.rs
@@ -46,7 +46,7 @@ impl Pipe {
     pub fn read(&self, addr: UVAddr, n: usize) -> Result<usize, ()> {
         let mut inner = self.inner.lock();
         loop {
-            match unsafe { inner.try_read(addr, n) } {
+            match inner.try_read(addr, n) {
                 Ok(r) => {
                     //DOC: piperead-wakeup
                     self.write_waitchannel.wakeup();
@@ -71,7 +71,7 @@ impl Pipe {
         let mut written = 0;
         let mut inner = self.inner.lock();
         loop {
-            match unsafe { inner.try_write(addr + written, n - written) } {
+            match inner.try_write(addr + written, n - written) {
                 Ok(r) => {
                     written += r;
                     self.read_waitchannel.wakeup();