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

Now handles NULL cookies for the VM fs calls gracefully (in case someone

Browse Source 
would want to mmap() a device directly).


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8884 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-09-07 15:39:03 +00:00
parent df435e99c2
commit bd80f1c775
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/fs/devfs.cpp
+6 -3
View File
@@ -1068,7 +1068,8 @@ devfs_can_page(fs_volume _fs, fs_vnode _vnode, fs_cookie cookie)
TRACE(("devfs_canpage: vnode %p\n", vnode));
if (vnode->stream.type != STREAM_TYPE_DEVICE
|| vnode->stream.u.dev.node == NULL)
|| vnode->stream.u.dev.node == NULL
|| cookie == NULL)
return false;
return vnode->stream.u.dev.info->read_pages != NULL;
@@ -1084,7 +1085,8 @@ devfs_read_pages(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, off_t pos, c
TRACE(("devfs_read_pages: vnode %p, vecs %p, count = %lu, pos = %Ld, size = %lu\n", vnode, vecs, count, pos, *_numBytes));
if (vnode->stream.type != STREAM_TYPE_DEVICE
|| vnode->stream.u.dev.info->read_pages == NULL)
|| vnode->stream.u.dev.info->read_pages == NULL
|| cookie == NULL)
return B_NOT_ALLOWED;
if (vnode->stream.u.dev.part_map)
@@ -1103,7 +1105,8 @@ devfs_write_pages(fs_volume _fs, fs_vnode _vnode, fs_cookie _cookie, off_t pos,
TRACE(("devfs_write_pages: vnode %p, vecs %p, count = %lu, pos = %Ld, size = %lu\n", vnode, vecs, count, pos, *_numBytes));
if (vnode->stream.type != STREAM_TYPE_DEVICE
|| vnode->stream.u.dev.info->write_pages == NULL)
|| vnode->stream.u.dev.info->write_pages == NULL
|| cookie == NULL)
return B_NOT_ALLOWED;
if (vnode->stream.u.dev.part_map)