3 files changed, 22 insertions, 29 deletions

diff --git a/fs/fcntl.c b/fs/fcntl.c
index dc4a7007f4e7..03c789560fb8 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -73,8 +73,8 @@ repeat:
          * orig_start..fdt->next_fd
          */
         start = orig_start;
-        if (start < fdt->next_fd)
-                start = fdt->next_fd;
+        if (start < files->next_fd)
+                start = files->next_fd;
 
         newfd = start;
         if (start < fdt->max_fdset) {
@@ -102,9 +102,8 @@ repeat:
          * we reacquire the fdtable pointer and use it while holding
          * the lock, no one can free it during that time.
          */
-        fdt = files_fdtable(files);
-        if (start <= fdt->next_fd)
-                fdt->next_fd = newfd + 1;
+        if (start <= files->next_fd)
+                files->next_fd = newfd + 1;
 
         error = newfd;
         
diff --git a/fs/file.c b/fs/file.c
index cea7cbea11d0..bbc743314730 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -125,7 +125,8 @@ static void free_fdtable_rcu(struct rcu_head *rcu)
                 kmem_cache_free(files_cachep, fdt->free_files);
                 return;
         }
-        if (fdt->max_fdset <= __FD_SETSIZE && fdt->max_fds <= NR_OPEN_DEFAULT) {
+        if (fdt->max_fdset <= EMBEDDED_FD_SET_SIZE &&
+                fdt->max_fds <= NR_OPEN_DEFAULT) {
                 /*
                  * The fdtable was embedded
                  */
@@ -155,8 +156,9 @@ static void free_fdtable_rcu(struct rcu_head *rcu)
 
 void free_fdtable(struct fdtable *fdt)
 {
-        if (fdt->free_files || fdt->max_fdset > __FD_SETSIZE ||
-                                        fdt->max_fds > NR_OPEN_DEFAULT)
+        if (fdt->free_files ||
+                fdt->max_fdset > EMBEDDED_FD_SET_SIZE ||
+                fdt->max_fds > NR_OPEN_DEFAULT)
                 call_rcu(&fdt->rcu, free_fdtable_rcu);
 }
 
@@ -199,7 +201,6 @@ static void copy_fdtable(struct fdtable *nfdt, struct fdtable *fdt)
                        (nfdt->max_fds - fdt->max_fds) *
                                         sizeof(struct file *));
         }
-        nfdt->next_fd = fdt->next_fd;
 }
 
 /*
@@ -220,11 +221,9 @@ fd_set * alloc_fdset(int num)
 
 void free_fdset(fd_set *array, int num)
 {
-        int size = num / 8;
-
-        if (num <= __FD_SETSIZE) /* Don't free an embedded fdset */
+        if (num <= EMBEDDED_FD_SET_SIZE) /* Don't free an embedded fdset */
                 return;
-        else if (size <= PAGE_SIZE)
+        else if (num <= 8 * PAGE_SIZE)
                 kfree(array);
         else
                 vfree(array);
@@ -237,22 +236,17 @@ static struct fdtable *alloc_fdtable(int nr)
         fd_set *new_openset = NULL, *new_execset = NULL;
         struct file **new_fds;
 
-        fdt = kmalloc(sizeof(*fdt), GFP_KERNEL);
+        fdt = kzalloc(sizeof(*fdt), GFP_KERNEL);
         if (!fdt)
                 goto out;
-        memset(fdt, 0, sizeof(*fdt));
 
-        nfds = __FD_SETSIZE;
+        nfds = 8 * L1_CACHE_BYTES;
         /* Expand to the max in easy steps */
-        do {
-                if (nfds < (PAGE_SIZE * 8))
-                        nfds = PAGE_SIZE * 8;
-                else {
-                        nfds = nfds * 2;
-                        if (nfds > NR_OPEN)
-                                nfds = NR_OPEN;
-                }
-        } while (nfds <= nr);
+        while (nfds <= nr) {
+                nfds = nfds * 2;
+                if (nfds > NR_OPEN)
+                        nfds = NR_OPEN;
+        }
 
         new_openset = alloc_fdset(nfds);
         new_execset = alloc_fdset(nfds);
diff --git a/fs/open.c b/fs/open.c
index 70e0230d8e77..1091dadd6c38 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -973,7 +973,7 @@ repeat:
         fdt = files_fdtable(files);
         fd = find_next_zero_bit(fdt->open_fds->fds_bits,
                                 fdt->max_fdset,
-                                fdt->next_fd);
+                                files->next_fd);
 
         /*
          * N.B. For clone tasks sharing a files structure, this test
@@ -998,7 +998,7 @@ repeat:
 
         FD_SET(fd, fdt->open_fds);
         FD_CLR(fd, fdt->close_on_exec);
-        fdt->next_fd = fd + 1;
+        files->next_fd = fd + 1;
 #if 1
         /* Sanity check */
         if (fdt->fd[fd] != NULL) {
@@ -1019,8 +1019,8 @@ static void __put_unused_fd(struct files_struct *files, unsigned int fd)
 {
         struct fdtable *fdt = files_fdtable(files);
         __FD_CLR(fd, fdt->open_fds);
-        if (fd < fdt->next_fd)
-                fdt->next_fd = fd;
+        if (fd < files->next_fd)
+                files->next_fd = fd;
 }
 
 void fastcall put_unused_fd(unsigned int fd)