| Message ID | 20181219011919.15352-1-samuel.thibault@ens-lyon.org |
|---|---|
| State | New |
| Headers | show |
| Series | [hurd,commited] hurd: Fix 64bit fcntl lock implementation | expand |
On 18/12/2018 23:19, Samuel Thibault wrote: > * sysdeps/mach/hurd/fcntl.c (__libc_fcntl): Test against 64bit `cmd' > values in the 64bit value cases. Thanks, this confirm the same fix I sent earlier for lockf consolidation [1]. [1] https://sourceware.org/ml/libc-alpha/2018-11/msg00676.html > --- > ChangeLog | 5 +++++ > sysdeps/mach/hurd/fcntl.c | 6 +++--- > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/ChangeLog b/ChangeLog > index 2945be5253..2ea7440b5a 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,3 +1,8 @@ > +2018-12-18 Samuel Thibault <samuel.thibault@ens-lyon.org> > + > + * sysdeps/mach/hurd/fcntl.c (__libc_fcntl): Test against 64bit `cmd' > + values in the 64bit value cases. > + > 2018-12-18 Albert ARIBAUD <albert.aribaud@3adev.fr> > > * include/time.h > diff --git a/sysdeps/mach/hurd/fcntl.c b/sysdeps/mach/hurd/fcntl.c > index f7f9abce03..663dcb0090 100644 > --- a/sysdeps/mach/hurd/fcntl.c > +++ b/sysdeps/mach/hurd/fcntl.c > @@ -158,13 +158,13 @@ __libc_fcntl (int fd, int cmd, ...) > va_end (ap); > switch (cmd) > { > - case F_GETLK: > + case F_GETLK64: > errno = ENOSYS; > return -1; > - case F_SETLKW: > + case F_SETLKW64: > wait = 1; > /* FALLTHROUGH */ > - case F_SETLK: > + case F_SETLK64: > return __f_setlk (fd, fl->l_type, fl->l_whence, > fl->l_start, fl->l_len, wait); > default: >
diff --git a/ChangeLog b/ChangeLog index 2945be5253..2ea7440b5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-12-18 Samuel Thibault <samuel.thibault@ens-lyon.org> + + * sysdeps/mach/hurd/fcntl.c (__libc_fcntl): Test against 64bit `cmd' + values in the 64bit value cases. + 2018-12-18 Albert ARIBAUD <albert.aribaud@3adev.fr> * include/time.h diff --git a/sysdeps/mach/hurd/fcntl.c b/sysdeps/mach/hurd/fcntl.c index f7f9abce03..663dcb0090 100644 --- a/sysdeps/mach/hurd/fcntl.c +++ b/sysdeps/mach/hurd/fcntl.c @@ -158,13 +158,13 @@ __libc_fcntl (int fd, int cmd, ...) va_end (ap); switch (cmd) { - case F_GETLK: + case F_GETLK64: errno = ENOSYS; return -1; - case F_SETLKW: + case F_SETLKW64: wait = 1; /* FALLTHROUGH */ - case F_SETLK: + case F_SETLK64: return __f_setlk (fd, fl->l_type, fl->l_whence, fl->l_start, fl->l_len, wait); default: