public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
* [hurd,commited] hurd: Fix 64bit fcntl lock implementation
@ 2018-12-19  2:00 Samuel Thibault
  2018-12-19 11:04 ` Adhemerval Zanella
  0 siblings, 1 reply; 2+ messages in thread
From: Samuel Thibault @ 2018-12-19  2:00 UTC (permalink / raw)
  To: libc-alpha; +Cc: Samuel Thibault, commit-hurd

	* sysdeps/mach/hurd/fcntl.c (__libc_fcntl): Test against 64bit `cmd'
	values in the 64bit value cases.
---
 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:
-- 
2.19.2

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [hurd,commited] hurd: Fix 64bit fcntl lock implementation
  2018-12-19  2:00 [hurd,commited] hurd: Fix 64bit fcntl lock implementation Samuel Thibault
@ 2018-12-19 11:04 ` Adhemerval Zanella
  0 siblings, 0 replies; 2+ messages in thread
From: Adhemerval Zanella @ 2018-12-19 11:04 UTC (permalink / raw)
  To: libc-alpha

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:
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-12-19 10:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-19  2:00 [hurd,commited] hurd: Fix 64bit fcntl lock implementation Samuel Thibault
2018-12-19 11:04 ` Adhemerval Zanella

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).