[PATCH] swapfile.c

[Andries.Brouwer@cwi.nl]

In 2.5.2 swapfile.c was broken:
In sys_swapon() we see

	swap_file = filp_open(name, O_RDWR, 0);
	if (IS_ERR(swap_file))
		goto bad_swap_2;

bad_swap_2:
	...
	if (swap_file)
		filp_close(swap_file, NULL);

and this oopses the kernel.
Below a trivial fix. Somebody with more time may come
back and polish stuff a little.

Andries

--- swapfile.c~	Sat Mar  2 18:23:19 2002
+++ swapfile.c	Sun Mar  3 23:08:48 2002
@@ -905,8 +905,10 @@
 	swap_file = filp_open(name, O_RDWR, 0);
 	putname(name);
 	error = PTR_ERR(swap_file);
-	if (IS_ERR(swap_file))
+	if (IS_ERR(swap_file)) {
+		swap_file = NULL;
 		goto bad_swap_2;
+	}
 
 	p->swap_file = swap_file;
 

[this was a patch relative to 2.5.6-pre2]