Merge branch 'master' of /home/aia21/ntfs-2.6/

1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/fork.c b/kernel/fork.c
index 9bd7b65ee418..c79ae0b19a49 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -607,12 +607,12 @@ static struct files_struct *alloc_files(void)
         atomic_set(&newf->count, 1);
 
         spin_lock_init(&newf->file_lock);
+        newf->next_fd = 0;
         fdt = &newf->fdtab;
-        fdt->next_fd = 0;
         fdt->max_fds = NR_OPEN_DEFAULT;
-        fdt->max_fdset = __FD_SETSIZE;
-        fdt->close_on_exec = &newf->close_on_exec_init;
-        fdt->open_fds = &newf->open_fds_init;
+        fdt->max_fdset = EMBEDDED_FD_SET_SIZE;
+        fdt->close_on_exec = (fd_set *)&newf->close_on_exec_init;
+        fdt->open_fds = (fd_set *)&newf->open_fds_init;
         fdt->fd = &newf->fd_array[0];
         INIT_RCU_HEAD(&fdt->rcu);
         fdt->free_files = NULL;