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

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

diff -u --recursive --new-file v2.3.2/linux/drivers/block/rd.c linux/drivers/block/rd.c
@@ -72,6 +72,7 @@
  */
 #define MAJOR_NR RAMDISK_MAJOR
 #include <linux/blk.h>
+#include <linux/blkpg.h>
 
 /*
  * We use a block size of 512 bytes in comparision to BLOCK_SIZE
@@ -198,11 +199,10 @@
 			if (!arg)  return -EINVAL;
 			return put_user(rd_length[minor] >> RDBLK_SIZE_BITS, (long *) arg);
 
-		case BLKSSZGET:	   /* Block size of media */
-			if (!arg)  return -EINVAL;
-			return put_user(rd_blocksizes[minor], (int *)arg);
-
-		RO_IOCTLS(inode->i_rdev, arg);
+		case BLKROSET:
+		case BLKROGET:
+		case BLKSSZGET:
+			return blk_ioctl(inode->i_rdev, cmd, arg);
 
 		default:
 			return -EINVAL;
@@ -519,7 +519,7 @@
 	}
 
 	if (nblocks > (rd_length[unit] >> RDBLK_SIZE_BITS)) {
-		printk("RAMDISK: image too big! (%d/%d blocks)\n",
+		printk("RAMDISK: image too big! (%d/%ld blocks)\n",
 		       nblocks, rd_length[unit] >> RDBLK_SIZE_BITS);
 		goto done;
 	}