[PATCH] Shrinks sizeof(files_struct) and better layout

[linux-2.6] / include / linux / init_task.h

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index dcfd2ecccb5d63dbcb2718a2f3e827aef9d68a23..92146f3b7423594f496b5051f6cb14d6b7d23297 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -7,11 +7,10 @@
 #define INIT_FDTABLE \
 {                                                      \
        .max_fds        = NR_OPEN_DEFAULT,              \
-       .max_fdset      = __FD_SETSIZE,                 \
-       .next_fd        = 0,                            \
+       .max_fdset      = EMBEDDED_FD_SET_SIZE,         \
        .fd             = &init_files.fd_array[0],      \
-       .close_on_exec  = &init_files.close_on_exec_init, \
-       .open_fds       = &init_files.open_fds_init,    \
+       .close_on_exec  = (fd_set *)&init_files.close_on_exec_init, \
+       .open_fds       = (fd_set *)&init_files.open_fds_init,  \
        .rcu            = RCU_HEAD_INIT,                \
        .free_files     = NULL,                         \
        .next           = NULL,                         \
@@ -20,9 +19,10 @@
 #define INIT_FILES \
 {                                                      \
        .count          = ATOMIC_INIT(1),               \
-       .file_lock      = SPIN_LOCK_UNLOCKED,           \
        .fdt            = &init_files.fdtab,            \
        .fdtab          = INIT_FDTABLE,                 \
+       .file_lock      = SPIN_LOCK_UNLOCKED,           \
+       .next_fd        = 0,                            \
        .close_on_exec_init = { { 0, } },               \
        .open_fds_init  = { { 0, } },                   \
        .fd_array       = { NULL, }                     \