Remove __ASSUME_F_GETOWN_EX.

This patch removes __ASSUME_F_GETOWN_EX now it can be assumed to be
true unconditionally.

Tested x86_64 that disassembly of installed shared libraries is
unchanged by this patch.

	* sysdeps/unix/sysv/linux/kernel-features.h
	(__ASSUME_F_GETOWN_EX): Remove macro.
	* sysdeps/unix/sysv/linux/fcntl.c: Do not include
	<kernel-features.h>.
	(miss_F_GETOWN_EX): Remove variable or macro.
	(do_fcntl): Do not check miss_F_GETOWN_EX.
	(do_fcntl) [!__ASSUME_F_GETOWN_EX]: Remove conditional code.

diff --git a/ChangeLog b/ChangeLog
index beea12c..548821e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2014-06-20  Joseph Myers  <joseph@codesourcery.com>
 
+       * sysdeps/unix/sysv/linux/kernel-features.h
+       (__ASSUME_F_GETOWN_EX): Remove macro.
+       * sysdeps/unix/sysv/linux/fcntl.c: Do not include
+       <kernel-features.h>.
+       (miss_F_GETOWN_EX): Remove variable or macro.
+       (do_fcntl): Do not check miss_F_GETOWN_EX.
+       (do_fcntl) [!__ASSUME_F_GETOWN_EX]: Remove conditional code.
+
        * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_AT_RANDOM):
        Remove macro.
        * sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard)

diff --git a/sysdeps/unix/sysv/linux/fcntl.c b/sysdeps/unix/sysv/linux/fcntl.c
index 1432a2c..c1d33da 100644 (file)
--- a/sysdeps/unix/sysv/linux/fcntl.c
+++ b/sysdeps/unix/sysv/linux/fcntl.c
@@ -22,20 +22,12 @@
 #include <stdarg.h>
 
 #include <sys/syscall.h>
-#include <kernel-features.h>
-
-
-#ifdef __ASSUME_F_GETOWN_EX
-# define miss_F_GETOWN_EX 0
-#else
-static int miss_F_GETOWN_EX;
-#endif
 
 
 static int
 do_fcntl (int fd, int cmd, void *arg)
 {
-  if (cmd != F_GETOWN || miss_F_GETOWN_EX)
+  if (cmd != F_GETOWN)
     return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
 
   INTERNAL_SYSCALL_DECL (err);
@@ -44,15 +36,6 @@ do_fcntl (int fd, int cmd, void *arg)
   if (!INTERNAL_SYSCALL_ERROR_P (res, err))
     return fex.type == F_OWNER_GID ? -fex.pid : fex.pid;
 
-#ifndef __ASSUME_F_GETOWN_EX
-  if (INTERNAL_SYSCALL_ERRNO (res, err) == EINVAL)
-    {
-      res = INLINE_SYSCALL (fcntl, 3, fd, F_GETOWN, arg);
-      miss_F_GETOWN_EX = 1;
-      return res;
-    }
-#endif
-
   __set_errno (INTERNAL_SYSCALL_ERRNO (res, err));
   return -1;
 }

diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 80655e0..b39b295 100644 (file)
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -173,9 +173,6 @@
 # define __ASSUME_REQUEUE_PI   1
 #endif
 
-/* Support for F_GETOWN_EX was introduced in 2.6.32.  */
-#define __ASSUME_F_GETOWN_EX   1
-
 /* Support for recvmmsg functionality was added in 2.6.33.  The macros
    defined correspond to those for accept4.  */
 #if __LINUX_KERNEL_VERSION >= 0x020621 && defined __ASSUME_SOCKETCALL