From 96e7ae6c4cecec41636e61a44be2412eedb080ac Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 18 Apr 2019 00:00:03 -0400 Subject: [PATCH] nvme_disk: Fix build under GCC7. --- src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp index 9a69cb8346..067a1ef6ea 100644 --- a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp +++ b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp @@ -417,8 +417,8 @@ nvme_disk_read(void* cookie, off_t pos, void* buffer, size_t* length) if (status != B_OK) { // The "rounded_len" will be the actual transferred length, but // of course it will contain the padding. - *length = std::min(*length, (size_t)std::max((off_t)0, - rounded_len - (pos - rounded_pos))); + *length = std::min(*length, std::max((size_t)0, + rounded_len - (size_t)(pos - rounded_pos))); if (*length == 0) return status; } @@ -488,8 +488,8 @@ nvme_disk_write(void* cookie, off_t pos, const void* buffer, size_t* length) status = nvme_disk_write(cookie, rounded_pos, bounceBuffer, &rounded_len); if (status != B_OK) { - *length = std::min(*length, (size_t)std::max((off_t)0, - rounded_len - (pos - rounded_pos))); + *length = std::min(*length, std::max((size_t)0, + rounded_len - (size_t)(pos - rounded_pos))); } return status; }