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

vfs: _user_flock() did not use FS advisory locking calls

Browse Source 
* The kernel's advisory locking implemenation must not be used if the
  file system has its own (ie. network file systems).
* Added ASSERT to free_vnode() that assures there is no locking left;
  I recently had a lot of them around.
This commit is contained in:
Axel Dörfler
2018-04-22 15:13:29 +02:00
parent 58c99ce4d4
commit 7750fdcf18
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/fs/vfs.cpp
+16 -7
View File
@@ -1,6 +1,6 @@
/* /*
* Copyright 2005-2013, Ingo Weinhold, [email protected]. * Copyright 2005-2013, Ingo Weinhold, [email protected].
* Copyright 2002-2017, Axel Dörfler, [email protected]. * Copyright 2002-2018, Axel Dörfler, [email protected].
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
@@ -997,6 +997,7 @@ free_vnode(struct vnode* vnode, bool reenter)
{ {
ASSERT_PRINT(vnode->ref_count == 0 && vnode->IsBusy(), "vnode: %p\n", ASSERT_PRINT(vnode->ref_count == 0 && vnode->IsBusy(), "vnode: %p\n",
vnode); vnode);
ASSERT_PRINT(vnode->advisory_locking == NULL, "vnode: %p\n", vnode);
// write back any changes in this vnode's cache -- but only // write back any changes in this vnode's cache -- but only
// if the vnode won't be deleted, in which case the changes // if the vnode won't be deleted, in which case the changes
@@ -9126,12 +9127,20 @@ _user_flock(int fd, int operation)
flock.l_type = (operation & LOCK_SH) != 0 ? F_RDLCK : F_WRLCK; flock.l_type = (operation & LOCK_SH) != 0 ? F_RDLCK : F_WRLCK;
status_t status; status_t status;
if ((operation & LOCK_UN) != 0) if ((operation & LOCK_UN) != 0) {
status = release_advisory_lock(vnode, &flock); if (HAS_FS_CALL(vnode, release_lock))
else { status = FS_CALL(vnode, release_lock, descriptor->cookie, &flock);
status = acquire_advisory_lock(vnode, else
thread_get_current_thread()->team->session_id, &flock, status = release_advisory_lock(vnode, &flock);
(operation & LOCK_NB) == 0); } else {
if (HAS_FS_CALL(vnode, acquire_lock)) {
status = FS_CALL(vnode, acquire_lock, descriptor->cookie, &flock,
(operation & LOCK_NB) == 0);
} else {
status = acquire_advisory_lock(vnode,
thread_get_current_thread()->team->session_id, &flock,
(operation & LOCK_NB) == 0);
}
} }
syscall_restart_handle_post(status); syscall_restart_handle_post(status);