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

scsi: use get_memory_map_etc().

Browse Source 
get_memory_map_etc() allows to not need an additional empty entry.
also fix a TODO

Change-Id: I1b5dc3e65267ccba2a21c7162cfc2504b16ad8f7
Reviewed-on: https://review.haiku-os.org/c/1490
Reviewed-by: Rene Gollent <[email protected]>
This commit is contained in:
Jérôme Duval
2019-05-28 17:43:10 +00:00
committed by Rene Gollent
parent e5b82f8034
commit 88e34b3b3d
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/scsi/virtual_memory.cpp
+4 -13
View File
@@ -63,27 +63,18 @@ get_iovec_memory_map(iovec *vec, size_t vec_count, size_t vec_offset, size_t len
vec_offset = 0;
if ((res = get_memory_map(range_start, range_len, &map[cur_idx],
max_entries - cur_idx)) != B_OK) {
cur_num_entries = max_entries - cur_idx;
if ((res = get_memory_map_etc(B_CURRENT_TEAM, range_start, range_len,
&map[cur_idx], &cur_num_entries)) != B_OK) {
// according to docu, no error is ever reported - argh!
SHOW_ERROR(1, "invalid io_vec passed (%s)", strerror(res));
return res;
}
// stupid: get_memory_map does neither tell how many sg blocks
// are used nor whether there were enough sg blocks at all;
// -> determine that manually
// TODO: Use get_memory_map_etc()!
cur_mapped_len = 0;
cur_num_entries = 0;
for (tmp_idx = cur_idx; tmp_idx < max_entries; ++tmp_idx) {
if (map[tmp_idx].size == 0)
break;
for (tmp_idx = cur_idx; tmp_idx < cur_idx + cur_num_entries; ++tmp_idx)
cur_mapped_len += map[tmp_idx].size;
++cur_num_entries;
}
if (cur_mapped_len == 0) {
panic("get_memory_map() returned empty list; left_len=%d, idx=%"