diff options
Diffstat (limited to 'libdiskfs/dir-lookup.c')
| -rw-r--r-- | libdiskfs/dir-lookup.c | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/libdiskfs/dir-lookup.c b/libdiskfs/dir-lookup.c index 9ebe3b45..16eb22e3 100644 --- a/libdiskfs/dir-lookup.c +++ b/libdiskfs/dir-lookup.c @@ -1,6 +1,7 @@ /* libdiskfs implementation of fs.defs:dir_lookup - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2008, 2013, 2014 Free Software Foundation, Inc. + + Copyright (C) 1992-2002, 2008, 2013-2019 + Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -13,8 +14,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 <stdio.h> #include <fcntl.h> @@ -499,12 +499,28 @@ diskfs_S_dir_lookup (struct protid *dircred, if (! err) { newpo = 0; + mach_port_t rendezvous = MACH_PORT_NULL; + struct flock64 lock = + { + l_start: 0, + l_len: 0, + l_whence: SEEK_SET + }; + if (flags & O_EXLOCK) - err = fshelp_acquire_lock (&np->userlock, &newpi->po->lock_status, - &np->lock, LOCK_EX); + { + lock.l_type = F_WRLCK; + err = fshelp_rlock_tweak (&np->userlock, &np->lock, + &newpi->po->lock_status, flags, 0, 0, + F_SETLK64, &lock, rendezvous); + } else if (flags & O_SHLOCK) - err = fshelp_acquire_lock (&np->userlock, &newpi->po->lock_status, - &np->lock, LOCK_SH); + { + lock.l_type = F_RDLCK; + err = fshelp_rlock_tweak (&np->userlock, &np->lock, + &newpi->po->lock_status, flags, 0, 0, + F_SETLK64, &lock, rendezvous); + } } if (! err) |