summary refs log tree commit diff
diff options
context:
space:
mode:
authorChirantan Ekbote <chirantan@chromium.org>2019-10-30 11:52:23 +0900
committerCommit Bot <commit-bot@chromium.org>2019-11-01 06:20:29 +0000
commitc2d221804f2ba559d68e7fc9676e833d703cd9ee (patch)
tree8d277ef8d42dd3473ae693fad360bd4ebe7817fa
parent2569b20f0fbfb976a7196ae9466c2c9d8ef506af (diff)
downloadcrosvm-c2d221804f2ba559d68e7fc9676e833d703cd9ee.tar
crosvm-c2d221804f2ba559d68e7fc9676e833d703cd9ee.tar.gz
crosvm-c2d221804f2ba559d68e7fc9676e833d703cd9ee.tar.bz2
crosvm-c2d221804f2ba559d68e7fc9676e833d703cd9ee.tar.lz
crosvm-c2d221804f2ba559d68e7fc9676e833d703cd9ee.tar.xz
crosvm-c2d221804f2ba559d68e7fc9676e833d703cd9ee.tar.zst
crosvm-c2d221804f2ba559d68e7fc9676e833d703cd9ee.zip
devices: fs: Fix available_bytes() call
This call was changed to not return a Result in "7f64f50
descriptor_utils: check for size overflow in new()".

BUG=b:136128319
TEST=build and run pjdfstests

Change-Id: Ibdc786b26ff35977723ba61c51e8cdf1b631edc8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1890581
Auto-Submit: Chirantan Ekbote <chirantan@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Chirantan Ekbote <chirantan@chromium.org>
-rw-r--r--devices/src/virtio/fs/server.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/devices/src/virtio/fs/server.rs b/devices/src/virtio/fs/server.rs
index 3c1c7e7..1914c9b 100644
--- a/devices/src/virtio/fs/server.rs
+++ b/devices/src/virtio/fs/server.rs
@@ -894,7 +894,7 @@ impl<F: FileSystem + Sync> Server<F> {
             );
         }
 
-        let available_bytes = w.available_bytes().map_err(Error::InvalidDescriptorChain)?;
+        let available_bytes = w.available_bytes();
         if available_bytes < size as usize {
             return reply_error(
                 io::Error::from_raw_os_error(libc::ENOMEM),