From c0737fa86da0f097155d5ee2835a66707449e78c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 15 Oct 2007 12:26:27 +0000 Subject: [PATCH] Fixed warnings. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22566 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/file_systems/fat/file.c | 18 +++++++++++------- src/add-ons/kernel/file_systems/fat/file.h | 4 ++-- src/add-ons/kernel/file_systems/fat/rtc_info.h | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/add-ons/kernel/file_systems/fat/file.c b/src/add-ons/kernel/file_systems/fat/file.c index 54eba201df..79ed6b0861 100644 --- a/src/add-ons/kernel/file_systems/fat/file.c +++ b/src/add-ons/kernel/file_systems/fat/file.c @@ -1479,12 +1479,13 @@ dosfs_can_page(fs_volume _fs, fs_vnode _v, fs_cookie _cookie) status_t dosfs_read_pages(fs_volume _fs, fs_vnode _node, fs_cookie _cookie, off_t pos, - const iovec *vecs, size_t count, size_t *_numBytes, bool reenter) + const iovec *vecs, size_t count, size_t *_numBytes, bool mayBlock, + bool reenter) { - nspace *vol = (nspace *)_fs; - vnode *node = (vnode *)_node; + nspace *vol = (nspace *)_fs; + vnode *node = (vnode *)_node; status_t status; - + if (check_nspace_magic(vol, "dosfs_read_pages") || check_vnode_magic(node, "dosfs_read_pages")) return EINVAL; @@ -1492,6 +1493,7 @@ dosfs_read_pages(fs_volume _fs, fs_vnode _node, fs_cookie _cookie, off_t pos, if (node->cache == NULL) return(B_BAD_VALUE); + // TODO: respect "mayBlock"! LOCK_VOL(vol); status = file_cache_read_pages(node->cache, pos, vecs, count, _numBytes); @@ -1503,10 +1505,11 @@ dosfs_read_pages(fs_volume _fs, fs_vnode _node, fs_cookie _cookie, off_t pos, status_t dosfs_write_pages(fs_volume _fs, fs_vnode _node, fs_cookie _cookie, off_t pos, - const iovec *vecs, size_t count, size_t *_numBytes, bool reenter) + const iovec *vecs, size_t count, size_t *_numBytes, bool mayBlock, + bool reenter) { - nspace *vol = (nspace *)_fs; - vnode *node = (vnode *)_node; + nspace *vol = (nspace *)_fs; + vnode *node = (vnode *)_node; status_t status; if (check_nspace_magic(vol, "dosfs_write_pages") @@ -1516,6 +1519,7 @@ dosfs_write_pages(fs_volume _fs, fs_vnode _node, fs_cookie _cookie, off_t pos, if (node->cache == NULL) return B_BAD_VALUE; + // TODO: respect "mayBlock"! LOCK_VOL(vol); status = file_cache_write_pages(node->cache, pos, vecs, count, _numBytes); diff --git a/src/add-ons/kernel/file_systems/fat/file.h b/src/add-ons/kernel/file_systems/fat/file.h index e61c64494a..900b3117b1 100644 --- a/src/add-ons/kernel/file_systems/fat/file.h +++ b/src/add-ons/kernel/file_systems/fat/file.h @@ -31,8 +31,8 @@ status_t dosfs_get_file_map(void *fs, void *node, off_t pos, size_t reqLen, struct file_io_vec *vecs, size_t *_count); bool dosfs_can_page(fs_volume _fs, fs_vnode _v, fs_cookie _cookie); status_t dosfs_read_pages(fs_volume _fs, fs_vnode _node, fs_cookie _cookie, off_t pos, - const iovec *vecs, size_t count, size_t *_numBytes, bool reenter); + const iovec *vecs, size_t count, size_t *_numBytes, bool mayBlock, bool reenter); status_t dosfs_write_pages(fs_volume _fs, fs_vnode _node, fs_cookie _cookie, off_t pos, - const iovec *vecs, size_t count, size_t *_numBytes, bool reenter); + const iovec *vecs, size_t count, size_t *_numBytes, bool mayBlock, bool reenter); #endif diff --git a/src/add-ons/kernel/file_systems/fat/rtc_info.h b/src/add-ons/kernel/file_systems/fat/rtc_info.h index 024acbf2ae..4850e42959 100644 --- a/src/add-ons/kernel/file_systems/fat/rtc_info.h +++ b/src/add-ons/kernel/file_systems/fat/rtc_info.h @@ -18,6 +18,6 @@ typedef struct { #define RTC_SETTINGS_FILE "RTC_time_settings" -extern _IMPEXP_KERNEL status_t get_rtc_info(rtc_info *); +extern status_t get_rtc_info(rtc_info *); #endif /* _RTC_INFO_H */