patch-2.3.3 linux/drivers/block/acsi.c

• Lines: 45
• Date: Sat May 15 23:43:04 1999
• Orig file: v2.3.2/linux/drivers/block/acsi.c
• Orig date: Fri May 14 18:55:13 1999

diff -u --recursive --new-file v2.3.2/linux/drivers/block/acsi.c linux/drivers/block/acsi.c
@@ -64,6 +64,7 @@
 typedef void Scsi_Device; /* hack to avoid including scsi.h */
 #include <scsi/scsi_ioctl.h>
 #include <linux/hdreg.h> /* for HDIO_GETGEO */
+#include <linux/blkpg.h>
 
 #include <asm/setup.h>
 #include <asm/pgtable.h>
@@ -1125,8 +1126,8 @@
 		return -EINVAL;
 	switch (cmd) {
 	  case HDIO_GETGEO:
-		/* HDIO_GETGEO is supported more for getting the partition's start
-		 * sector... */
+		/* HDIO_GETGEO is supported more for getting the partition's
+		 * start sector... */
 	  { struct hd_geometry *geo = (struct hd_geometry *)arg;
 	    /* just fake some geometry here, it's nonsense anyway; to make it
 		 * easy, use Adaptec's usual 64/32 mapping */
@@ -1147,19 +1148,18 @@
 	  case BLKGETSIZE:   /* Return device size */
 		return put_user(acsi_part[MINOR(inode->i_rdev)].nr_sects,
 				(long *) arg);
-		
+
+	  case BLKROSET:
+	  case BLKROGET:
 	  case BLKFLSBUF:
-		if(!capable(CAP_SYS_ADMIN))  return -EACCES;
-		if(!inode->i_rdev) return -EINVAL;
-		fsync_dev(inode->i_rdev);
-		invalidate_buffers(inode->i_rdev);
-		return 0;
+	  case BLKPG:
+		return blk_ioctl(inode->i_rdev, cmd, arg);
 
 	  case BLKRRPART: /* Re-read partition tables */
 	        if (!capable(CAP_SYS_ADMIN)) 
 			return -EACCES;
 		return revalidate_acsidisk(inode->i_rdev, 1);
-	  RO_IOCTLS(inode->i_rdev,arg);
+
 	  default:
 		return -EINVAL;
 	}