From 417f276c05ea693ad26aa7c1357832ec414ebaf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 4 Oct 2007 13:23:00 +0000 Subject: [PATCH] Forgot to commit the fs_shell with r22434, thanks for the note, Stefano! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22435 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tools/fs_shell/file_cache.cpp | 14 +++++++------- src/tools/fs_shell/rootfs.cpp | 10 ++++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/tools/fs_shell/file_cache.cpp b/src/tools/fs_shell/file_cache.cpp index 14970a5891..7f1083401c 100644 --- a/src/tools/fs_shell/file_cache.cpp +++ b/src/tools/fs_shell/file_cache.cpp @@ -179,9 +179,9 @@ static fssh_status_t vm_cache_resize(file_cache_ref *cacheRef, fssh_off_t newSiz static fssh_status_t vm_cache_write_modified(file_cache_ref *ref, bool fsReenter); static fssh_status_t vfs_read_pages(int fd, fssh_off_t pos, const fssh_iovec *vecs, - fssh_size_t count, fssh_size_t *_numBytes, bool fsReenter); + fssh_size_t count, fssh_size_t *_numBytes, bool mayBlock, bool fsReenter); static fssh_status_t vfs_write_pages(int fd, fssh_off_t pos, const fssh_iovec *vecs, - fssh_size_t count, fssh_size_t *_numBytes, bool fsReenter); + fssh_size_t count, fssh_size_t *_numBytes, bool mayBlock, bool fsReenter); static fssh_status_t pages_io(file_cache_ref *ref, fssh_off_t offset, const fssh_iovec *vecs, fssh_size_t count, fssh_size_t *_numBytes, bool doWrite); @@ -741,7 +741,7 @@ vm_cache_write_modified(file_cache_ref *cache, bool fsReenter) fssh_status_t vfs_read_pages(int fd, fssh_off_t pos, const fssh_iovec *vecs, fssh_size_t count, - fssh_size_t *_numBytes, bool fsReenter) + fssh_size_t *_numBytes, bool mayBlock, bool fsReenter) { // check how much the iovecs allow us to read fssh_size_t toRead = 0; @@ -781,7 +781,7 @@ vfs_read_pages(int fd, fssh_off_t pos, const fssh_iovec *vecs, fssh_size_t count fssh_status_t vfs_write_pages(int fd, fssh_off_t pos, const fssh_iovec *vecs, fssh_size_t count, - fssh_size_t *_numBytes, bool fsReenter) + fssh_size_t *_numBytes, bool mayBlock, bool fsReenter) { // check how much the iovecs allow us to write fssh_size_t toWrite = 0; @@ -1122,7 +1122,7 @@ pages_io(file_cache_ref *ref, fssh_off_t offset, const fssh_iovec *vecs, fssh_si size = numBytes; status = vfs_read_pages(ref->deviceFD, fileVecs[0].offset, vecs, - count, &size, false); + count, &size, true, false); if (status < FSSH_B_OK) return status; @@ -1219,10 +1219,10 @@ pages_io(file_cache_ref *ref, fssh_off_t offset, const fssh_iovec *vecs, fssh_si fssh_size_t bytes = size; if (doWrite) { status = vfs_write_pages(ref->deviceFD, fileOffset, - tempVecs, tempCount, &bytes, false); + tempVecs, tempCount, &bytes, true, false); } else { status = vfs_read_pages(ref->deviceFD, fileOffset, - tempVecs, tempCount, &bytes, false); + tempVecs, tempCount, &bytes, true, false); } if (status < FSSH_B_OK) return status; diff --git a/src/tools/fs_shell/rootfs.cpp b/src/tools/fs_shell/rootfs.cpp index 2db6fa87c5..35e2007e01 100644 --- a/src/tools/fs_shell/rootfs.cpp +++ b/src/tools/fs_shell/rootfs.cpp @@ -772,16 +772,18 @@ rootfs_can_page(fssh_fs_volume _fs, fssh_fs_vnode _v, fssh_fs_cookie cookie) static fssh_status_t -rootfs_read_pages(fssh_fs_volume _fs, fssh_fs_vnode _v, fssh_fs_cookie cookie, fssh_off_t pos, - const fssh_iovec *vecs, fssh_size_t count, fssh_size_t *_numBytes, bool reenter) +rootfs_read_pages(fssh_fs_volume _fs, fssh_fs_vnode _v, fssh_fs_cookie cookie, + fssh_off_t pos, const fssh_iovec *vecs, fssh_size_t count, + fssh_size_t *_numBytes, bool mayBlock, bool reenter) { return FSSH_B_NOT_ALLOWED; } static fssh_status_t -rootfs_write_pages(fssh_fs_volume _fs, fssh_fs_vnode _v, fssh_fs_cookie cookie, fssh_off_t pos, - const fssh_iovec *vecs, fssh_size_t count, fssh_size_t *_numBytes, bool reenter) +rootfs_write_pages(fssh_fs_volume _fs, fssh_fs_vnode _v, fssh_fs_cookie cookie, + fssh_off_t pos, const fssh_iovec *vecs, fssh_size_t count, + fssh_size_t *_numBytes, bool mayBlock, bool reenter) { return FSSH_B_NOT_ALLOWED; }