* fs_{write|read}_pages() now has an additional argument "mayBlock".
* the page writer don't allow to block, while all other writers do. This fixes bug #1509. The reason the page writer needs this is because it marks several pages from different caches as busy. * Fixed a warning about ASSERT being defined already in BFS, since util/DoublyLinkedList.h now includes debug.h. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22434 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
+3
-3
@@ -362,7 +362,7 @@ pages_io(file_cache_ref *ref, off_t offset, const iovec *vecs, size_t count,
|
||||
size = numBytes;
|
||||
|
||||
status = vfs_read_pages(ref->device, ref->cookie, fileVecs[0].offset,
|
||||
vecs, count, &size, false);
|
||||
vecs, count, &size, true, false);
|
||||
if (status < B_OK)
|
||||
return status;
|
||||
|
||||
@@ -459,10 +459,10 @@ pages_io(file_cache_ref *ref, off_t offset, const iovec *vecs, size_t count,
|
||||
size_t bytes = size;
|
||||
if (doWrite) {
|
||||
status = vfs_write_pages(ref->device, ref->cookie,
|
||||
fileOffset, tempVecs, tempCount, &bytes, false);
|
||||
fileOffset, tempVecs, tempCount, &bytes, true, false);
|
||||
} else {
|
||||
status = vfs_read_pages(ref->device, ref->cookie,
|
||||
fileOffset, tempVecs, tempCount, &bytes, false);
|
||||
fileOffset, tempVecs, tempCount, &bytes, true, false);
|
||||
}
|
||||
if (status < B_OK)
|
||||
return status;
|
||||
|
||||
Reference in New Issue
Block a user