* [PATCH] Fix fcntl on ppc64 and x86_64
@ 2004-06-25 19:51 Jakub Jelinek
2004-06-27 20:48 ` Ulrich Drepper
0 siblings, 1 reply; 2+ messages in thread
From: Jakub Jelinek @ 2004-06-25 19:51 UTC (permalink / raw)
To: Ulrich Drepper, Roland McGrath; +Cc: Glibc hackers
Hi!
This (untested) patch ought to fix 2 things:
1) ppc64 doesn't have a fcntl64 syscall (unlike ppc32), so it shouldn't
attempt to call it when it knows it doesn't exist. Unfortunately, unlike
all other 64-bit arches, F_GETLK64/F_SETLK64/F_SETLKW64 values are
different from non-64 defines.
2) F_GETLK/F_SETLK/F_SETLKW was defined to 5/6/7 on x86_64
-m32 -D_FILE_OFFSET_BITS=64, so userland was expecting off_t (== 64 bit)
types, while kernel was setting 32 bits.
While 1) is just an optimization, 2) is a bug fix.
2004-06-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/powerpc/fcntl.c: Move to...
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fcntl.c: ... here.
* sysdeps/unix/sysv/linux/powerpc/lockf64.c: Move to...
* sysdeps/unix/sysv/linux/powerpc/powerpc32/lockf64.c: ... here.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c: New file.
* sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h (F_GETLK, F_SETLK,
F_SETLKW): Fix values for -m32 -D_FILE_OFFSET_BITS=64.
--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c.jj 2004-06-25 21:31:22.333225531 +0200
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/fcntl.c 2004-06-25 21:33:22.811979616 +0200
@@ -0,0 +1,70 @@
+/* Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdarg.h>
+
+#include <sysdep-cancel.h>
+#include <sys/syscall.h>
+
+
+int
+__fcntl_nocancel (int fd, int cmd, ...)
+{
+ va_list ap;
+ void *arg;
+
+ va_start (ap, cmd);
+ arg = va_arg (ap, void *);
+ va_end (ap);
+
+ return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
+}
+
+
+int
+__libc_fcntl (int fd, int cmd, ...)
+{
+ va_list ap;
+ void *arg;
+
+ va_start (ap, cmd);
+ arg = va_arg (ap, void *);
+ va_end (ap);
+
+ if (cmd >= F_GETLK64 && cmd <= F_SETLKW64)
+ cmd -= F_GETLK64 - F_GETLK;
+
+ if (SINGLE_THREAD_P || cmd != F_SETLKW)
+ return __fcntl_nocancel (fd, cmd, arg);
+
+ int oldtype = LIBC_CANCEL_ASYNC ();
+
+ int result = __fcntl_nocancel (fd, cmd, arg);
+
+ LIBC_CANCEL_RESET (oldtype);
+
+ return result;
+}
+libc_hidden_def (__libc_fcntl)
+
+weak_alias (__libc_fcntl, __fcntl)
+libc_hidden_weak (__fcntl)
+weak_alias (__libc_fcntl, fcntl)
--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/fcntl.c.jj 2004-06-25 21:30:20.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/fcntl.c 2000-09-29 09:28:03.000000000 +0200
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/fcntl.c>
--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/lockf64.c.jj 2004-06-25 21:30:20.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/lockf64.c 2000-09-29 09:28:03.000000000 +0200
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/lockf64.c>
--- libc/sysdeps/unix/sysv/linux/powerpc/fcntl.c.jj 2000-09-29 09:28:03.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/powerpc/fcntl.c 2004-06-25 21:31:01.555889459 +0200
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/fcntl.c>
--- libc/sysdeps/unix/sysv/linux/powerpc/lockf64.c.jj 2000-09-29 09:28:03.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/powerpc/lockf64.c 2004-06-25 21:31:05.560183334 +0200
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/lockf64.c>
--- libc/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h.jj 2004-05-07 14:33:05.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h 2004-06-25 21:42:15.505037812 +0200
@@ -70,18 +70,29 @@
#define F_SETFD 2 /* Set file descriptor flags. */
#define F_GETFL 3 /* Get file status flags. */
#define F_SETFL 4 /* Set file status flags. */
-#define F_GETLK 5 /* Get record locking info. */
-#define F_SETLK 6 /* Set record locking info (non-blocking). */
-#define F_SETLKW 7 /* Set record locking info (blocking). */
#if __WORDSIZE == 64
-# define F_GETLK64 F_GETLK /* Get record locking info. */
-# define F_SETLK64 F_SETLK /* Set record locking info (non-blocking). */
-# define F_SETLKW64 F_SETLKW /* Set record locking info (blocking). */
+# define F_GETLK 5 /* Get record locking info. */
+# define F_SETLK 6 /* Set record locking info (non-blocking). */
+# define F_SETLKW 7 /* Set record locking info (blocking). */
+/* Not necessary, we always have 64-bit offsets. */
+# define F_GETLK64 5 /* Get record locking info. */
+# define F_SETLK64 6 /* Set record locking info (non-blocking). */
+# define F_SETLKW64 7 /* Set record locking info (blocking). */
#else
-#define F_GETLK64 12 /* Get record locking info. */
-#define F_SETLK64 13 /* Set record locking info (non-blocking). */
-#define F_SETLKW64 14 /* Set record locking info (blocking). */
+# ifndef __USE_FILE_OFFSET64
+# define F_GETLK 5 /* Get record locking info. */
+# define F_SETLK 6 /* Set record locking info (non-blocking). */
+# define F_SETLKW 7 /* Set record locking info (blocking). */
+# else
+# define F_GETLK F_GETLK64 /* Get record locking info. */
+# define F_SETLK F_SETLK64 /* Set record locking info (non-blocking).*/
+# define F_SETLKW F_SETLKW64 /* Set record locking info (blocking). */
+# endif
+# define F_GETLK64 12 /* Get record locking info. */
+# define F_SETLK64 13 /* Set record locking info (non-blocking). */
+# define F_SETLKW64 14 /* Set record locking info (blocking). */
#endif
+
#if defined __USE_BSD || defined __USE_UNIX98
# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */
# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */
Jakub
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix fcntl on ppc64 and x86_64
2004-06-25 19:51 [PATCH] Fix fcntl on ppc64 and x86_64 Jakub Jelinek
@ 2004-06-27 20:48 ` Ulrich Drepper
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Drepper @ 2004-06-27 20:48 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: Glibc hackers
Applied.
--
⧠Ulrich Drepper ⧠Red Hat, Inc. ⧠444 Castro St ⧠Mountain View, CA â
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-06-27 20:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-06-25 19:51 [PATCH] Fix fcntl on ppc64 and x86_64 Jakub Jelinek
2004-06-27 20:48 ` Ulrich Drepper
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).