Consolidate non cancellable fcntl call

This patch consolidates all the non cancellable fcntl calls to use
the __fcntl_nocancel identifier.  For non cancellable targets it will
be just a macro to call the default respective symbol while on Linux
will be a internal one.

Since its prototype is already defined at internal fcntl.h header, it
is removed from not-cancel.h one.

Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu.

	* login/utmp_file.c (timeout_handler): Replace fcntl_not_cancel with
	__fcntl_nocancel.
	* sysdeps/generic/not-cancel.h (fcntl_not_cancel): Remove macro.
	* sysdeps/unix/sysv/linux/not-cancel.h (fcntl_not_cancel): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 6e74ce30650ae29a246af5335ac48c49f1048144..759aa4bed45e5cb4ffbe44fa6766c5134902f463 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2017-08-21  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
+       * login/utmp_file.c (timeout_handler): Replace fcntl_not_cancel with
+       __fcntl_nocancel.
+       * sysdeps/generic/not-cancel.h (fcntl_not_cancel): Remove macro.
+       * sysdeps/unix/sysv/linux/not-cancel.h (fcntl_not_cancel): Likewise.
+
        * gmon/gmon.c (write_hist): Replace writev_not_cancel_no_status with
        __writev_nocancel_nostatus.
        (write_call_graph): Likewise.

diff --git a/login/utmp_file.c b/login/utmp_file.c
index 68e00f2a0212b3dbd6cacbdf9c66ff57331c5034..d410b6c53305d79056df6030f4bd7c9778119afb 100644 (file)
--- a/login/utmp_file.c
+++ b/login/utmp_file.c
@@ -81,7 +81,7 @@ static void timeout_handler (int signum) {};
   memset (&fl, '\0', sizeof (struct flock));                                 \
   fl.l_type = (type);                                                        \
   fl.l_whence = SEEK_SET;                                                    \
-  if (fcntl_not_cancel ((fd), F_SETLKW, &fl) < 0)
+  if (__fcntl_nocancel ((fd), F_SETLKW, &fl) < 0)
 
 #define LOCKING_FAILED() \
   goto unalarm_return
@@ -89,7 +89,7 @@ static void timeout_handler (int signum) {};
 #define UNLOCK_FILE(fd) \
   /* Unlock the file.  */                                                    \
   fl.l_type = F_UNLCK;                                                       \
-  fcntl_not_cancel ((fd), F_SETLKW, &fl);                                    \
+  __fcntl_nocancel ((fd), F_SETLKW, &fl);                                    \
                                                                              \
  unalarm_return:                                                             \
   /* Reset the signal handler and alarm.  We must reset the alarm            \

diff --git a/sysdeps/generic/not-cancel.h b/sysdeps/generic/not-cancel.h
index e3ed0e6e65c1a3dfdf95d7714341947d28cbcb99..cf8455099d888aa4379fe65642a6c2b9e88cfc69 100644 (file)
--- a/sysdeps/generic/not-cancel.h
+++ b/sysdeps/generic/not-cancel.h
@@ -36,8 +36,6 @@
   __write (fd, buf, n)
 #define __writev_nocancel_nostatus(fd, iov, n) \
   (void) __writev (fd, iov, n)
-#define fcntl_not_cancel(fd, cmd, val) \
-  __fcntl (fd, cmd, val)
 # define waitpid_not_cancel(pid, stat_loc, options) \
   __waitpid (pid, stat_loc, options)
 #define pause_not_cancel() \

diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h
index 29926d34948fa720a8dca5c1ae81eb779b7e6351..acf5775928d92744f6d0990afa30685cacbe9c48 100644 (file)
--- a/sysdeps/unix/sysv/linux/not-cancel.h
+++ b/sysdeps/unix/sysv/linux/not-cancel.h
@@ -71,10 +71,6 @@ __writev_nocancel_nostatus (int fd, const struct iovec *iov, int iovcnt)
   INTERNAL_SYSCALL_CALL (writev, err, fd, iov, iovcnt);
 }
 
-/* Uncancelable fcntl.  */
-#define fcntl_not_cancel(fd, cmd, val) \
-  __fcntl_nocancel (fd, cmd, val)
-
 /* Uncancelable waitpid.  */
 #define __waitpid_nocancel(pid, stat_loc, options) \
   INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL)