diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/file.h | 6 | ||||
-rw-r--r-- | include/linux/init_task.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/file.h b/include/linux/file.h index 6e77b9177f9e..02be4012225b 100644 --- a/include/linux/file.h +++ b/include/linux/file.h | |||
@@ -26,14 +26,8 @@ struct embedded_fd_set { | |||
26 | unsigned long fds_bits[1]; | 26 | unsigned long fds_bits[1]; |
27 | }; | 27 | }; |
28 | 28 | ||
29 | /* | ||
30 | * More than this number of fds: we use a separately allocated fd_set | ||
31 | */ | ||
32 | #define EMBEDDED_FD_SET_SIZE (BITS_PER_BYTE * sizeof(struct embedded_fd_set)) | ||
33 | |||
34 | struct fdtable { | 29 | struct fdtable { |
35 | unsigned int max_fds; | 30 | unsigned int max_fds; |
36 | int max_fdset; | ||
37 | struct file ** fd; /* current fd array */ | 31 | struct file ** fd; /* current fd array */ |
38 | fd_set *close_on_exec; | 32 | fd_set *close_on_exec; |
39 | fd_set *open_fds; | 33 | fd_set *open_fds; |
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 7272ff9ee77c..58c18daab65d 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #define INIT_FDTABLE \ | 12 | #define INIT_FDTABLE \ |
13 | { \ | 13 | { \ |
14 | .max_fds = NR_OPEN_DEFAULT, \ | 14 | .max_fds = NR_OPEN_DEFAULT, \ |
15 | .max_fdset = EMBEDDED_FD_SET_SIZE, \ | ||
16 | .fd = &init_files.fd_array[0], \ | 15 | .fd = &init_files.fd_array[0], \ |
17 | .close_on_exec = (fd_set *)&init_files.close_on_exec_init, \ | 16 | .close_on_exec = (fd_set *)&init_files.close_on_exec_init, \ |
18 | .open_fds = (fd_set *)&init_files.open_fds_init, \ | 17 | .open_fds = (fd_set *)&init_files.open_fds_init, \ |