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

IOCache: adjust the last iovec when the capacity isn't multiple of B_PAGE_SIZE

Browse Source 
Patch by mark_mcs, edited by me
this fixes #16030

Change-Id: I9255fe960f73cdfc3fd2668cdaf7db19fedd70f1
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3451
Reviewed-by: Rene Gollent <[email protected]>
This commit is contained in:
Jérôme Duval
2020-12-02 23:48:32 +00:00
committed by waddlesplash
parent 5f51a74f1a
commit 00866cc149
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/device_manager/IOCache.cpp
+6
View File
@@ -545,6 +545,12 @@ IOCache::_TransferPages(size_t firstPage, size_t pageCount, bool isWrite,
} }
} }
// Don't try to read past the end of the device just to fill a page;
// this makes sure that sum(fVecs[].length) == requestLength
generic_size_t padLength = B_PAGE_SIZE - requestLength % B_PAGE_SIZE;
if (vecCount > 0 && padLength != B_PAGE_SIZE)
fVecs[vecCount - 1].length -= padLength;
// create a request for the transfer // create a request for the transfer
IORequest request; IORequest request;
status_t error = request.Init(firstPageOffset, fVecs, vecCount, status_t error = request.Init(firstPageOffset, fVecs, vecCount,