Fixed two typos.
Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7844 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -74,8 +74,6 @@ blkman_map_iovecs(iovec *vec, size_t vec_count, size_t vec_offset, size_t len,
|
|||||||
map->vec[cur_idx].address, (int)map->vec[cur_idx].size,
|
map->vec[cur_idx].address, (int)map->vec[cur_idx].size,
|
||||||
(int)max_len, (int)cur_idx, (int)map->num);
|
(int)max_len, (int)cur_idx, (int)map->num);
|
||||||
|
|
||||||
//snooze(100000);
|
|
||||||
|
|
||||||
if (max_len < map->vec[cur_idx].size) {
|
if (max_len < map->vec[cur_idx].size) {
|
||||||
// split sg block
|
// split sg block
|
||||||
map->num = min(map->num + 1, max_phys_entries);
|
map->num = min(map->num + 1, max_phys_entries);
|
||||||
@@ -156,7 +154,6 @@ blkman_lock_iovecs(struct iovec *vecs, uint num_vecs,
|
|||||||
|
|
||||||
res = lock_memory((void *)((addr_t)vecs->iov_base + vec_offset), lock_len, flags);
|
res = lock_memory((void *)((addr_t)vecs->iov_base + vec_offset), lock_len, flags);
|
||||||
if (res != B_OK) {
|
if (res != B_OK) {
|
||||||
//snooze( 1000000 );
|
|
||||||
SHOW_FLOW(3, "cannot lock: %s", strerror(res));
|
SHOW_FLOW(3, "cannot lock: %s", strerror(res));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -257,8 +254,6 @@ blkman_readwrite(blkman_handle_info *handle, off_t pos, struct iovec *vec,
|
|||||||
|
|
||||||
phys_vecs *phys_vecs;
|
phys_vecs *phys_vecs;
|
||||||
|
|
||||||
//snooze( 1000000 );
|
|
||||||
|
|
||||||
SHOW_FLOW(3, "pos = %Ld, len = %lu, need_locking = %d, write = %d, vec_count = %d",
|
SHOW_FLOW(3, "pos = %Ld, len = %lu, need_locking = %d, write = %d, vec_count = %d",
|
||||||
pos, len, need_locking, write, vec_count);
|
pos, len, need_locking, write, vec_count);
|
||||||
|
|
||||||
@@ -338,9 +333,9 @@ blkman_readwrite(blkman_handle_info *handle, off_t pos, struct iovec *vec,
|
|||||||
block_ofs = pos - block_pos * block_size;
|
block_ofs = pos - block_pos * block_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
// read requests byond end of volume must be ignored without notice
|
// read requests beyond end of volume must be ignored without notice
|
||||||
if (block_pos >= capacity) {
|
if (block_pos >= capacity) {
|
||||||
SHOW_FLOW0(1, "transfer starts byond end of device");
|
SHOW_FLOW0(1, "transfer starts beyond end of device");
|
||||||
goto err2;
|
goto err2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user