Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed warnings. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22566 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2007-10-15 12:26:27 +00:00
parent c3d49e1317
commit c0737fa86d
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/add-ons/kernel/file_systems/fat/file.c
View File

@ -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);

4
src/add-ons/kernel/file_systems/fat/file.h
View File

@ -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

2
src/add-ons/kernel/file_systems/fat/rtc_info.h
View File

@ -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 */