[PATCH] knfsd: Convert sunrpc_cache to use krefs

[linux-2.6-omap-h63xx.git] / include / linux / init_task.h

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index c727c195a91a87cc0015abb05d7ed8660cf63453..92146f3b7423594f496b5051f6cb14d6b7d23297 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -2,17 +2,27 @@
 #define _LINUX__INIT_TASK_H
 
 #include <linux/file.h>
+#include <linux/rcupdate.h>
+
+#define INIT_FDTABLE \
+{                                                      \
+       .max_fds        = NR_OPEN_DEFAULT,              \
+       .max_fdset      = EMBEDDED_FD_SET_SIZE,         \
+       .fd             = &init_files.fd_array[0],      \
+       .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,                         \
+}
 
 #define INIT_FILES \
 {                                                      \
        .count          = ATOMIC_INIT(1),               \
+       .fdt            = &init_files.fdtab,            \
+       .fdtab          = INIT_FDTABLE,                 \
        .file_lock      = SPIN_LOCK_UNLOCKED,           \
-       .max_fds        = NR_OPEN_DEFAULT,              \
-       .max_fdset      = __FD_SETSIZE,                 \
        .next_fd        = 0,                            \
-       .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_init = { { 0, } },               \
        .open_fds_init  = { { 0, } },                   \
        .fd_array       = { NULL, }                     \
@@ -41,7 +51,6 @@
        .page_table_lock =  SPIN_LOCK_UNLOCKED,                 \
        .mmlist         = LIST_HEAD_INIT(name.mmlist),          \
        .cpu_vm_mask    = CPU_MASK_ALL,                         \
-       .default_kioctx = INIT_KIOCTX(name.default_kioctx, name),       \
 }
 
 #define INIT_SIGNALS(sig) {    \