diff options
| -rw-r--r-- | src/linux.rs | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/linux.rs b/src/linux.rs index c8eb478..6a50449 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -890,7 +890,7 @@ fn create_pmem_device( .open(&disk.path) .map_err(|e| Error::Disk(disk.path.to_path_buf(), e))?; - let (disk_size, arena_size) = { + let arena_size = { let metadata = std::fs::metadata(&disk.path).map_err(|e| Error::Disk(disk.path.to_path_buf(), e))?; let disk_len = metadata.len(); @@ -905,12 +905,9 @@ fn create_pmem_device( } else { 0 }; - ( - disk_len, - disk_len - .checked_add(align_adjust) - .ok_or(Error::PmemDeviceImageTooBig)?, - ) + disk_len + .checked_add(align_adjust) + .ok_or(Error::PmemDeviceImageTooBig)? }; let protection = { @@ -924,11 +921,10 @@ fn create_pmem_device( let arena = { // Conversion from u64 to usize may fail on 32bit system. let arena_size = usize::try_from(arena_size).map_err(|_| Error::PmemDeviceImageTooBig)?; - let disk_size = usize::try_from(disk_size).map_err(|_| Error::PmemDeviceImageTooBig)?; let mut arena = MemoryMappingArena::new(arena_size).map_err(Error::ReservePmemMemory)?; arena - .add_fd_offset_protection(0, disk_size, &fd, 0, protection) + .add_fd_offset_protection(0, arena_size, &fd, 0, protection) .map_err(Error::ReservePmemMemory)?; arena }; |