diff options
| author | Neal H Walfield <neal@cs.uml.edu> | 2019-10-29 23:56:23 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-10-30 00:04:29 +0100 |
| commit | dd7447b87c6d6d1afaf25553b0f911853dcc6683 (patch) | |
| tree | 341036fa3041e04fd77538ae4dbb172db317a513 /libdiskfs/peropen-rele.c | |
| parent | 916f1569078e9da233898694c62cd3ad039e803c (diff) | |
| download | hurd-dd7447b87c6d6d1afaf25553b0f911853dcc6683.tar.gz hurd-dd7447b87c6d6d1afaf25553b0f911853dcc6683.tar.bz2 hurd-dd7447b87c6d6d1afaf25553b0f911853dcc6683.zip | |
libdiskfs: Support for file record locking
2019-03-04 Svante Signell <svante.signell@gmail.com>
* file-lock.c: Make flock work regardless of the
mode in which the file was opened.
2019-02-12 Svante Signell <svante.signell@gmail.com>
* file-lock.c: Comment out "Make flock work without R or W mode"
2019-02-01 Svante Signell <svante.signell@gmail.com>
* Update copyright years.
* file-record-lock.c(diskfs_S_file_record_lock):
Don't set rendezvous to MACH_PORT_NULL.
2018-12-07 Svante Signell <svante.signell@gmail.com>
* Update copyright years.
* dir-lookup.c(diskfs_S_dir_lookup): Call fshelp_rlock_tweak()
with new last argument rendezvous = MACH_PORT_NULL.
* file-lock.c(diskfs_S_file_lock): Likewise.
* file-record-lock.c(diskfs_S_file_record_lock): Likewise.
(diskfs_S_file_record_lock): Add new argument mach_port_t rendezvous.
2017-01-05 Svante Signell <svante.signell@gmail.com>
* Update copyright years and headers.
2016-05-23 Svante Signell <svante.signell@gmail.com>
* file-lock-stat.c: Port from cthreads to libpthread.
* file-lock.c: Likewise.
* file-record-lock: Likewise.
2001-04-11 Neal H Walfield <neal@cs.uml.edu>
* Makefile (FSSRCS): Add file-record-lock.c.
* diskfs.h (struct peropen): Change the type of lock_status
from an int to a struct rlock_peropen.
(struct node): Change the type of userbox from a struct lock_box
to a struct rlock_box.
* dir-lookup.c (diskfs_S_dir_lookup): Use fshelp_rlock_tweak
as fshelp_acquire_lock is now depreciated.
* file-lock-stat.c (diskfs_S_file_lock_stat): Total rewrite
around the new record locking functions.
* file-lock.c (diskfs_S_file_lock): Total rewrite around the
new record locking functions.
* file-record-lock.c: New file. Implement
diskfs_S_file_record_lock.
* node-make.c (diskfs_make_node): Initialize userbox with
fshelp_rlock_init.
* peropen-make.c (diskfs_make_peropen): Initialize lock_status
using fshelp_rlock_po_init.
* peropen-rele.c (diskfs_release_peropen): Release lock_status
using fshelp_rlock_drop_peropen.
Diffstat (limited to 'libdiskfs/peropen-rele.c')
| -rw-r--r-- | libdiskfs/peropen-rele.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/libdiskfs/peropen-rele.c b/libdiskfs/peropen-rele.c index 877137bb..e8d83b55 100644 --- a/libdiskfs/peropen-rele.c +++ b/libdiskfs/peropen-rele.c @@ -1,5 +1,5 @@ -/* - Copyright (C) 1994, 1996, 1997 Free Software Foundation +/* + Copyright (C) 1994, 1996, 1997, 2014-2019 Free Software Foundation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -12,8 +12,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + along with the GNU Hurd. If not, see <http://www.gnu.org/licenses/>. */ #include <sys/file.h> #include "priv.h" @@ -33,14 +32,9 @@ diskfs_release_peropen (struct peropen *po) if (po->shadow_root_parent) mach_port_deallocate (mach_task_self (), po->shadow_root_parent); - - if (po->lock_status != LOCK_UN) - { - pthread_mutex_lock (&po->np->lock); - fshelp_acquire_lock (&po->np->userlock, &po->lock_status, - &po->np->lock, LOCK_UN); - diskfs_nput (po->np); - } + fshelp_rlock_drop_peropen (&po->lock_status); + if (fshelp_rlock_peropen_status(&po->lock_status) != LOCK_UN) + diskfs_nput (po->np); else diskfs_nrele (po->np); |