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

* get_vnode() now accepts a NULL parameter for the fsNode argument. 

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25660 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2008-05-26 11:32:27 +00:00
parent 61de73e29c
commit 1e18692e12
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1362,7 +1362,7 @@ acquire_advisory_lock(struct vnode *vnode, pid_t session, struct flock *flock,
LockList::Iterator iterator = locking->locks.GetIterator();
while (iterator.HasNext()) {
struct advisory_lock *lock = iterator.Next();
// TODO: locks from the same team might be joinable!
if (lock->team != team && advisory_lock_intersects(lock, flock)) {
// locks do overlap
@ -3192,7 +3192,7 @@ publish_vnode(fs_volume *volume, ino_t vnodeID, void *privateNode,
extern "C" status_t
get_vnode(fs_volume *volume, ino_t vnodeID, void **fsNode)
get_vnode(fs_volume *volume, ino_t vnodeID, void **_fsNode)
{
struct vnode *vnode;
@ -3216,9 +3216,10 @@ get_vnode(fs_volume *volume, ino_t vnodeID, void **fsNode)
return status;
}
*fsNode = resolvedNode.private_node;
} else
*fsNode = vnode->private_node;
if (_fsNode != NULL)
*_fsNode = resolvedNode.private_node;
} else if (_fsNode != NULL)
*_fsNode = vnode->private_node;
return B_OK;
}