i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use file_map_translate() instead of bfs_get_file_map().

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26678 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-07-29 13:54:43 +00:00
parent 188233b954
commit e9c954c387
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/kernel_interface.cpp
+4 -10
View File
@@ -24,9 +24,6 @@ struct identify_cookie {
disk_super_block super_block; disk_super_block super_block;
}; };
static status_t bfs_get_file_map(fs_volume *_volume, fs_vnode *_node,
off_t offset, size_t size, struct file_io_vec *vecs, size_t *_count);
extern void fill_stat_buffer(Inode *inode, struct stat &stat); extern void fill_stat_buffer(Inode *inode, struct stat &stat);
@@ -427,18 +424,15 @@ static status_t
bfs_iterative_io_get_vecs(void* cookie, io_request *request, off_t offset, bfs_iterative_io_get_vecs(void* cookie, io_request *request, off_t offset,
size_t size, struct file_io_vec *vecs, size_t *_count) size_t size, struct file_io_vec *vecs, size_t *_count)
{ {
fs_vnode *node = (fs_vnode*)cookie; Inode *inode = (Inode*)cookie;
return file_map_translate(inode->Map(), offset, size, vecs, _count);
return bfs_get_file_map(volume_for_vnode(node), node, offset, size, vecs,
_count);
} }
static status_t static status_t
bfs_iterative_io_finished(void *cookie, io_request *request, status_t status) bfs_iterative_io_finished(void *cookie, io_request *request, status_t status)
{ {
fs_vnode *_node = (fs_vnode*)cookie; Inode *inode = (Inode*)cookie;
Inode *inode = (Inode *)_node->private_node;
rw_lock_read_unlock(&inode->Lock()); rw_lock_read_unlock(&inode->Lock());
@@ -462,7 +456,7 @@ bfs_io(fs_volume *_volume, fs_vnode *_node, void *_cookie, io_request *request)
rw_lock_read_lock(&inode->Lock()); rw_lock_read_lock(&inode->Lock());
return do_iterative_fd_io(volume->Device(), request, return do_iterative_fd_io(volume->Device(), request,
bfs_iterative_io_get_vecs, bfs_iterative_io_finished, _node); bfs_iterative_io_get_vecs, bfs_iterative_io_finished, inode);
} }