i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme_disk: Fix build under GCC7.

Browse Source
This commit is contained in:
Augustin Cavalier
2019-04-18 00:00:03 -04:00
parent 2bd1323ab8
commit 96e7ae6c4c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
+4 -4
View File
@@ -417,8 +417,8 @@ nvme_disk_read(void* cookie, off_t pos, void* buffer, size_t* length)
if (status != B_OK) { if (status != B_OK) {
// The "rounded_len" will be the actual transferred length, but // The "rounded_len" will be the actual transferred length, but
// of course it will contain the padding. // of course it will contain the padding.
*length = std::min(*length, (size_t)std::max((off_t)0, *length = std::min(*length, std::max((size_t)0,
rounded_len - (pos - rounded_pos))); rounded_len - (size_t)(pos - rounded_pos)));
if (*length == 0) if (*length == 0)
return status; 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, status = nvme_disk_write(cookie, rounded_pos, bounceBuffer,
&rounded_len); &rounded_len);
if (status != B_OK) { if (status != B_OK) {
*length = std::min(*length, (size_t)std::max((off_t)0, *length = std::min(*length, std::max((size_t)0,
rounded_len - (pos - rounded_pos))); rounded_len - (size_t)(pos - rounded_pos)));
} }
return status; return status;
} }