[LV-kern-commit] CVS: kernel-2.4/drivers/block cciss.c,1.2,1.3 floppy.c,1.2,1.3 loop.c,1.2,1.3 nbd.c,1.2,1.3 rd.c,1.2,1.3

[Dave A. <ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/block
In directory sc8-pr-cvs1:/tmp/cvs-serv7538/drivers/block

Modified Files:
	cciss.c floppy.c loop.c nbd.c rd.c 
Log Message:
DA: sync with Marcelo 2.4.17


Index: cciss.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/block/cciss.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cciss.c	11 Apr 2002 14:26:58 -0000	1.2
+++ cciss.c	10 Jun 2003 01:13:25 -0000	1.3
@@ -2019,7 +2019,7 @@
 static struct pci_driver cciss_pci_driver = {
 	 name:   "cciss",
 	probe:  cciss_init_one,
-	remove:  cciss_remove_one,
+	remove:  __devexit_p(cciss_remove_one),
 	id_table:  cciss_pci_device_id, /* id_table */
 };
 

Index: floppy.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/block/floppy.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- floppy.c	11 Apr 2002 14:26:58 -0000	1.2
+++ floppy.c	10 Jun 2003 01:13:25 -0000	1.3
@@ -4498,3 +4498,5 @@
 	}
 }
 #endif
+
+EXPORT_NO_SYMBOLS;

Index: loop.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/block/loop.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- loop.c	11 Apr 2002 14:26:58 -0000	1.2
+++ loop.c	10 Jun 2003 01:13:25 -0000	1.3
@@ -578,6 +578,8 @@
 	atomic_inc(&lo->lo_pending);
 	spin_unlock_irq(&lo->lo_lock);
 
+	current->flags |= PF_NOIO;
+
 	/*
 	 * up sem, we are running
 	 */
@@ -640,6 +642,10 @@
 
 	if (S_ISBLK(inode->i_mode)) {
 		lo_device = inode->i_rdev;
+		if (lo_device == dev) {
+			error = -EBUSY;
+			goto out;
+		}
 	} else if (S_ISREG(inode->i_mode)) {
 		struct address_space_operations *aops = inode->i_mapping->a_ops;
 		/*

Index: nbd.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/block/nbd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nbd.c	11 Apr 2002 14:26:58 -0000	1.2
+++ nbd.c	10 Jun 2003 01:13:25 -0000	1.3
@@ -45,7 +45,6 @@
 
 #include <linux/devfs_fs_kernel.h>
 
-#include <asm/segment.h>
 #include <asm/uaccess.h>
 #include <asm/types.h>
 

Index: rd.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/block/rd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rd.c	11 Apr 2002 14:26:58 -0000	1.2
+++ rd.c	10 Jun 2003 01:13:25 -0000	1.3
@@ -110,7 +110,7 @@
  */
 int rd_size = CONFIG_BLK_DEV_RAM_SIZE;		/* Size of the RAM disks */
 /*
- * It would be very desiderable to have a soft-blocksize (that in the case
+ * It would be very desirable to have a soft-blocksize (that in the case
  * of the ramdisk driver is also the hardblocksize ;) of PAGE_SIZE because
  * doing that we'll achieve a far better MM footprint. Using a rd_blocksize of
  * BLOCK_SIZE in the worst case we'll make PAGE_SIZE/BLOCK_SIZE buffer-pages