From dd7447b87c6d6d1afaf25553b0f911853dcc6683 Mon Sep 17 00:00:00 2001 From: Neal H Walfield Date: Tue, 29 Oct 2019 23:56:23 +0100 Subject: libdiskfs: Support for file record locking 2019-03-04 Svante Signell * file-lock.c: Make flock work regardless of the mode in which the file was opened. 2019-02-12 Svante Signell * file-lock.c: Comment out "Make flock work without R or W mode" 2019-02-01 Svante Signell * 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 * 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 * Update copyright years and headers. 2016-05-23 Svante Signell * file-lock-stat.c: Port from cthreads to libpthread. * file-lock.c: Likewise. * file-record-lock: Likewise. 2001-04-11 Neal H Walfield * 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. --- libdiskfs/file-lock-stat.c | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) (limited to 'libdiskfs/file-lock-stat.c') diff --git a/libdiskfs/file-lock-stat.c b/libdiskfs/file-lock-stat.c index a31ad9a2..c6990c46 100644 --- a/libdiskfs/file-lock-stat.c +++ b/libdiskfs/file-lock-stat.c @@ -1,38 +1,42 @@ -/* - Copyright (C) 1994, 1995 Free Software Foundation +/* Copyright (C) 1994-1995, 2001, 2014-2019 Free Software Foundation, Inc. - This file is part of the GNU Hurd. + Written by Neal H Walfield - The GNU Hurd is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2, or (at + your option) any later version. - The GNU Hurd is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. You should have received a copy of the GNU General Public License - along with the GNU Hurd; see the file COPYING. If not, write to - the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ - -/* Written by Michael I. Bushnell. */ + along with the GNU Hurd. If not, see . */ #include "priv.h" #include "fs_S.h" +#include +#include + kern_return_t diskfs_S_file_lock_stat (struct protid *cred, int *mystatus, int *otherstatus) { + struct node *node; + if (!cred) return EOPNOTSUPP; - - pthread_mutex_lock (&cred->po->np->lock); - *mystatus = cred->po->lock_status; - *otherstatus = cred->po->np->userlock.type; - pthread_mutex_unlock (&cred->po->np->lock); + + node = cred->po->np; + + pthread_mutex_lock (&node->lock); + *mystatus = fshelp_rlock_peropen_status (&cred->po->lock_status); + *otherstatus = fshelp_rlock_node_status (&node->userlock); + pthread_mutex_unlock (&node->lock); + return 0; } -- cgit v1.2.3