patch-2.0.1 linux/mm/swapfile.c

• Lines: 19
• Date: Tue Jun 11 13:00:11 1996
• Orig file: v2.0.0/linux/mm/swapfile.c
• Orig date: Fri May 31 08:02:20 1996

diff -u --recursive --new-file v2.0.0/linux/mm/swapfile.c linux/mm/swapfile.c
@@ -16,6 +16,7 @@
 #include <linux/swap.h>
 #include <linux/fs.h>
 #include <linux/swapctl.h>
+#include <linux/blkdev.h> /* for blk_size */
 
 #include <asm/dma.h>
 #include <asm/system.h> /* for cli()/sti() */
@@ -457,7 +458,9 @@
 		if(error)
 			goto bad_swap_2;
 		error = -ENODEV;
-		if (!p->swap_device)
+		if (!p->swap_device ||
+		    (blk_size[MAJOR(p->swap_device)] &&
+		     !blk_size[MAJOR(p->swap_device)][MINOR(p->swap_device)]))
 			goto bad_swap;
 		error = -EBUSY;
 		for (i = 0 ; i < nr_swapfiles ; i++) {