8ded2bbc18
Recently, glibc made a change to suppress sign-conversion warnings in
FD_SET (glibc commit ceb9e56b3d1). This uncovered an issue with the
kernel's definition of __NFDBITS if applications #include
<linux/types.h> after including <sys/select.h>. A build failure would
be seen when passing the -Werror=sign-compare and -D_FORTIFY_SOURCE=2
flags to gcc.
It was suggested that the kernel should either match the glibc
definition of __NFDBITS or remove that entirely. The current in-kernel
uses of __NFDBITS can be replaced with BITS_PER_LONG, and there are no
uses of the related __FDELT and __FDMASK defines. Given that, we'll
continue the cleanup that was started with commit 8b3d1cda4f
("posix_types: Remove fd_set macros") and drop the remaining unused
macros.
Additionally, linux/time.h has similar macros defined that expand to
nothing so we'll remove those at the same time.
Reported-by: Jeff Law <law@redhat.com>
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
CC: <stable@vger.kernel.org>
Signed-off-by: Josh Boyer <jwboyer@redhat.com>
[ .. and fix up whitespace as per akpm ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
38 lines
1 KiB
C
38 lines
1 KiB
C
#ifndef _LINUX_POSIX_TYPES_H
|
|
#define _LINUX_POSIX_TYPES_H
|
|
|
|
#include <linux/stddef.h>
|
|
|
|
/*
|
|
* This allows for 1024 file descriptors: if NR_OPEN is ever grown
|
|
* beyond that you'll have to change this too. But 1024 fd's seem to be
|
|
* enough even for such "real" unices like OSF/1, so hopefully this is
|
|
* one limit that doesn't have to be changed [again].
|
|
*
|
|
* Note that POSIX wants the FD_CLEAR(fd,fdsetp) defines to be in
|
|
* <sys/time.h> (and thus <linux/time.h>) - but this is a more logical
|
|
* place for them. Solved by having dummy defines in <sys/time.h>.
|
|
*/
|
|
|
|
/*
|
|
* This macro may have been defined in <gnu/types.h>. But we always
|
|
* use the one here.
|
|
*/
|
|
#undef __FD_SETSIZE
|
|
#define __FD_SETSIZE 1024
|
|
|
|
typedef struct {
|
|
unsigned long fds_bits[__FD_SETSIZE / (8 * sizeof(long))];
|
|
} __kernel_fd_set;
|
|
|
|
/* Type of a signal handler. */
|
|
typedef void (*__kernel_sighandler_t)(int);
|
|
|
|
/* Type of a SYSV IPC key. */
|
|
typedef int __kernel_key_t;
|
|
typedef int __kernel_mqd_t;
|
|
|
|
#include <asm/posix_types.h>
|
|
|
|
#endif /* _LINUX_POSIX_TYPES_H */
|