From 9b275cfccc7654f38f29107fa8d99422eb16cd7c Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 5 Feb 2019 18:55:42 +0000 Subject: [PATCH] Make F_RDLCK/F_WRLCK atomic lockf(LOCK_EX) would for instance drop any existing shared lock before taking the exclusive lock. F_RDLCK/F_WRLCK need atomic changes, so introduce and use __LOCK_ATOM Signed-off-by: Samuel Thibault * misc/sys/file.h (__LOCK_ATOMIC): New macro. * sysdeps/mach/hurd/fcntl.c (__libc_fcntl): Use __LOCK_ATOMIC along LOCK_SH and LOCK_EX. XXX: Adding to misc/sys/file.h is questionable Gbp-Pq: Topic hurd-i386 Gbp-Pq: Name tg-WRLCK-upgrade.diff --- misc/sys/file.h | 1 + sysdeps/mach/hurd/f_setlk.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/misc/sys/file.h b/misc/sys/file.h index 86abfa18d..e6494fa33 100644 --- a/misc/sys/file.h +++ b/misc/sys/file.h @@ -40,6 +40,7 @@ __BEGIN_DECLS #define LOCK_SH 1 /* Shared lock. */ #define LOCK_EX 2 /* Exclusive lock. */ #define LOCK_UN 8 /* Unlock. */ +#define __LOCK_ATOMIC 16 /* Atomic update. */ /* Can be OR'd in to one of the above. */ #define LOCK_NB 4 /* Don't block when locking. */ diff --git a/sysdeps/mach/hurd/f_setlk.c b/sysdeps/mach/hurd/f_setlk.c index edfb292db..27f7d2729 100644 --- a/sysdeps/mach/hurd/f_setlk.c +++ b/sysdeps/mach/hurd/f_setlk.c @@ -35,8 +35,8 @@ __f_setlk (int fd, int type, int whence, __off64_t start, __off64_t len, int wai switch (type) { - case F_RDLCK: cmd = LOCK_SH; break; - case F_WRLCK: cmd = LOCK_EX; break; + case F_RDLCK: cmd = LOCK_SH | __LOCK_ATOMIC; break; + case F_WRLCK: cmd = LOCK_EX | __LOCK_ATOMIC; break; case F_UNLCK: cmd = LOCK_UN; break; default: errno = EINVAL; -- 2.30.2