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

Partially revert 24d0e21f51

Browse Source 
This reverts the extra for loop condition from
"do_iterative_fd_io_iterate(): Support sparse files".

When reading a file with more than 8 block_runs, get_vecs() would
return B_BUFFER_OVERFLOW which would never create any subrequest due
to the test on error == B_OK on the loop, but instead just fail.

Except for the get_vecs() return code, where it is not wanted,
the test made no sense as all other assignments are tested directly
or passed around with break.

Works for me but I don't guarantee it's completely correct.
This commit is contained in:
François Revol
2013-12-08 01:43:02 +01:00
parent e8948527c2
commit 664e3fba9b
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/fs/vfs_request_io.cpp
+1 -3
View File
@@ -165,9 +165,7 @@ do_iterative_fd_io_iterate(void* _cookie, io_request* request,
// create subrequests for the file vecs we've got // create subrequests for the file vecs we've got
size_t subRequestCount = 0; size_t subRequestCount = 0;
for (size_t i = 0; for (size_t i = 0; i < vecCount && subRequestCount < kMaxSubRequests; i++) {
i < vecCount && subRequestCount < kMaxSubRequests && error == B_OK;
i++) {
off_t vecOffset = vecs[i].offset; off_t vecOffset = vecs[i].offset;
off_t vecLength = min_c(vecs[i].length, (off_t)requestLength); off_t vecLength = min_c(vecs[i].length, (off_t)requestLength);
TRACE_RIO("[%ld] vec %lu offset: %lld, length: %lld\n", TRACE_RIO("[%ld] vec %lu offset: %lld, length: %lld\n",