diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-07-03 15:37:16 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-08-21 15:37:45 -0300 |
commit | 7369800c04f3c0fb9fb15821feb10a7976425aca (patch) | |
tree | 3fe16adef74746757be6e3b8e524355798611e25 /sysdeps | |
parent | 19926de954bf89feb443aadd4db47a4e912b97b1 (diff) | |
download | glibc-7369800c04f3c0fb9fb15821feb10a7976425aca.tar.gz glibc-7369800c04f3c0fb9fb15821feb10a7976425aca.tar.xz glibc-7369800c04f3c0fb9fb15821feb10a7976425aca.zip |
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.
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/generic/not-cancel.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/not-cancel.h | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/sysdeps/generic/not-cancel.h b/sysdeps/generic/not-cancel.h index e3ed0e6e65..cf8455099d 100644 --- 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 29926d3494..acf5775928 100644 --- 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) |