patch-2.2.12 linux/kernel/exit.c

• Lines: 52
• Date: Wed Aug 25 17:29:53 1999
• Orig file: v2.2.11/linux/kernel/exit.c
• Orig date: Fri Apr 30 08:13:37 1999

diff -u --recursive --new-file v2.2.11/linux/kernel/exit.c linux/kernel/exit.c
@@ -9,6 +9,7 @@
 #include <linux/interrupt.h>
 #include <linux/smp_lock.h>
 #include <linux/module.h>
+#include <linux/vmalloc.h>
 #ifdef CONFIG_BSD_PROCESS_ACCT
 #include <linux/acct.h>
 #endif
@@ -22,7 +23,7 @@
 
 int getrusage(struct task_struct *, int, struct rusage *);
 
-static void release(struct task_struct * p)
+void release(struct task_struct * p)
 {
 	if (p != current) {
 #ifdef __SMP__
@@ -159,11 +160,11 @@
 
 	j = 0;
 	for (;;) {
-		unsigned long set = files->open_fds.fds_bits[j];
+		unsigned long set;
 		i = j * __NFDBITS;
-		j++;
-		if (i >= files->max_fds)
+		if (i >= files->max_fdset || i >= files->max_fds)
 			break;
+		set = files->open_fds->fds_bits[j++];
 		while (set) {
 			if (set & 1) {
 				struct file * file = files->fd[i];
@@ -189,12 +190,14 @@
 		if (atomic_dec_and_test(&files->count)) {
 			close_files(files);
 			/*
-			 * Free the fd array as appropriate ...
+ 			 * Free the fd and fdset arrays if we expanded them.
 			 */
-			if (NR_OPEN * sizeof(struct file *) == PAGE_SIZE)
-				free_page((unsigned long) files->fd);
-			else
-				kfree(files->fd);
+ 			if (files->fd != &files->fd_array[0])
+ 				free_fd_array(files->fd, files->max_fds);
+ 			if (files->max_fdset > __FD_SETSIZE) {
+ 				free_fdset(files->open_fds, files->max_fdset);
+ 				free_fdset(files->close_on_exec, files->max_fdset);
+ 			}
 			kmem_cache_free(files_cachep, files);
 		}
 	}