From 40ab805df48b2f65d5028ba59063e2a36f19f452 Mon Sep 17 00:00:00 2001
From: Svante Signell <svante.signell@gmail.com>
Date: Wed, 30 Oct 2019 02:33:27 +0100
Subject: libnetfs: 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(netfs_S_file_record_lock):
Don't set rendezvous to MACH_PORT_NULL.
2017-01-05 Svante Signell <svante.signell@gmail.com>
* Update copyright years and headers.
* dir-lookup.c(netfs_S_dir_lookup): Call fshelp_rlock_tweak()
with new last argument rendezvous = MACH_PORT_NULL.
* file-lock.c(netfs_S_file_lock): Likewise.
* file-record-lock.c(netfs_S_file_record_lock): Likewise.
(netfs_S_file_record_lock): Add new argument mach_port_t rendezvous.
2016-05-23 Svante Signell <svante.signell@gmail.com>
* netfs.h (struct peropen): Change the type of rlock_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 (netfs_S_dir_lookup): Use fshelp_rlock_tweak.
* file-lock-stat.c (netfs_S_file_lock_stat): Total rewrite
around the new record locking functions.
* file-lock.c (netfs_S_file_lock): Likewise.
* file-record-lock.c (netfs_S_file_record_lock): Likewise.
* make-node.c (netfs_make_node): Initialize userbox with
fshelp_rlock_init.
* make-peropen.c (netfs_make_peropen): Initialize lock_status
using fshelp_rlock_po_init.
(netfs_make_peropen): Add a comment that po->refcnt starts at zero.
* relese-peropen.c (netfs_release_peropen): Release lock_status
using fshelp_rlock_drop_peropen.
2001-04-11 Neal H Walfield <neal@cs.uml.edu>
* file-record-lock.c: New file. Implement
netfs_S_file_record_lock.
* Makefile (SRCS): Add file-record-lock.c
---
libnetfs/file-lock-stat.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
(limited to 'libnetfs/file-lock-stat.c')
diff --git a/libnetfs/file-lock-stat.c b/libnetfs/file-lock-stat.c
index 49529cf4..c2145918 100644
--- a/libnetfs/file-lock-stat.c
+++ b/libnetfs/file-lock-stat.c
@@ -1,5 +1,5 @@
-/*
- Copyright (C) 1995 Free Software Foundation, Inc.
+/*
+ Copyright (C) 1995, 2015-2019 Free Software Foundation, Inc.
Written by Michael I. Bushnell, p/BSG.
This file is part of the GNU Hurd.
@@ -15,23 +15,30 @@
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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */
+ along with the GNU Hurd. If not, see <http://www.gnu.org/licenses/>. */
#include "netfs.h"
#include "fs_S.h"
+#include <fcntl.h>
+#include <sys/file.h>
+
error_t
netfs_S_file_lock_stat (struct protid *user,
int *mystatus,
int *otherstatus)
{
+
+ struct node *node;
+
if (!user)
return EOPNOTSUPP;
-
- pthread_mutex_lock (&user->po->np->lock);
- *mystatus = user->po->lock_status;
- *otherstatus = user->po->np->userlock.type;
- pthread_mutex_unlock (&user->po->np->lock);
+
+ node = user->po->np;
+ pthread_mutex_lock (&node->lock);
+ *mystatus = fshelp_rlock_peropen_status (&user->po->lock_status);
+ *otherstatus = fshelp_rlock_node_status (&node->userlock);
+ pthread_mutex_unlock (&node->lock);
+
return 0;
}
--
cgit v1.2.3