diff options
Diffstat (limited to 'libnetfs/file-lock.c')
| -rw-r--r-- | libnetfs/file-lock.c | 48 |
1 files changed, 40 insertions, 8 deletions
diff --git a/libnetfs/file-lock.c b/libnetfs/file-lock.c index 0010d4be..7bb81d43 100644 --- a/libnetfs/file-lock.c +++ b/libnetfs/file-lock.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,22 +15,54 @@ 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 (struct protid *user, int flags) { error_t err; + struct flock64 lock; + struct node *node; + int openstat = user->po->openstat; + mach_port_t rendezvous = MACH_PORT_NULL; + if (!user) return EOPNOTSUPP; - pthread_mutex_lock (&user->po->np->lock); - err = fshelp_acquire_lock (&user->po->np->userlock, &user->po->lock_status, - &user->po->np->lock, flags); - pthread_mutex_unlock (&user->po->np->lock); + + lock.l_whence = SEEK_SET; + lock.l_start = 0; + lock.l_len = 0; + + if (flags & LOCK_UN) + lock.l_type = F_UNLCK; + else if (flags & LOCK_SH) + lock.l_type = F_RDLCK; + else if (flags & LOCK_EX) + lock.l_type = F_WRLCK; + else + return EINVAL; + + /* + XXX: Fix for flock(2) calling fcntl(2) + From flock(2): A shared or exclusive lock can be placed on a file + regardless of the mode in which the file was opened. + */ + if (openstat & (O_RDONLY|O_WRONLY|O_EXEC)) openstat |= O_RDONLY|O_WRONLY; + + node = user->po->np; + pthread_mutex_lock (&node->lock); + err = fshelp_rlock_tweak (&node->userlock, &node->lock, + &user->po->lock_status, openstat, + 0, 0, flags & LOCK_NB ? F_SETLK64 : F_SETLKW64, + &lock, rendezvous); + pthread_mutex_unlock (&node->lock); + return err; } |