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

* Reverted r26293 again, as that "subtle" change also prevented any device I/O

Browse Source 
from happening...


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26294 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-07-07 12:45:38 +00:00
parent bed8516acc
commit 92c3ae2b69
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/system/kernel/fs/vfs.cpp
View File

@ -4722,12 +4722,8 @@ file_read(struct file_descriptor *descriptor, off_t pos, void *buffer,
struct vnode *vnode = descriptor->u.vnode;
FUNCTION(("file_read: buf %p, pos %Ld, len %p = %ld\n", buffer, pos, length, *length));
if (!S_ISREG(vnode->type)) {
if (S_ISDIR(vnode->type))
return B_IS_A_DIRECTORY;
return B_BAD_VALUE;
}
if (S_ISDIR(vnode->type))
return B_IS_A_DIRECTORY;
return FS_CALL(vnode, read, descriptor->cookie, pos, buffer, length);
}
@ -4740,12 +4736,8 @@ file_write(struct file_descriptor *descriptor, off_t pos, const void *buffer,
struct vnode *vnode = descriptor->u.vnode;
FUNCTION(("file_write: buf %p, pos %Ld, len %p\n", buffer, pos, length));
if (!S_ISREG(vnode->type)) {
if (S_ISDIR(vnode->type))
return B_IS_A_DIRECTORY;
return B_BAD_VALUE;
}
if (S_ISDIR(vnode->type))
return B_IS_A_DIRECTORY;
return FS_CALL(vnode, write, descriptor->cookie, pos, buffer, length);
}