[PATCH] (2/3) more kdev_t removals

drivers/acorn/block/mfmhd.c

@@ -1222,7 +1222,7 @@ static int mfm_ioctl(struct inode *inode, struct file *file, u_int cmd, u_long a
 	case BLKROSET:
 	case BLKROGET:
 	case BLKPG:
-		return blk_ioctl(dev, cmd, arg);
+		return blk_ioctl(inode->i_bdev, cmd, arg);
 
 	default:
 		return -EINVAL;

drivers/block/DAC960.c

@@ -5398,7 +5398,7 @@ static int DAC960_IOCTL(Inode_T *Inode, File_T *File,
     case BLKFLSBUF:
     case BLKBSZGET:
     case BLKBSZSET:
-      return blk_ioctl(Inode->i_rdev, Request, Argument);
+      return blk_ioctl(Inode->i_bdev, Request, Argument);
 
     case BLKRRPART:
       /* Re-Read Partition Table. */

drivers/block/acsi.c

@@ -1141,7 +1141,7 @@ static int acsi_ioctl( struct inode *inode, struct file *file,
 	  case BLKROGET:
 	  case BLKFLSBUF:
 	  case BLKPG:
-		return blk_ioctl(inode->i_rdev, cmd, arg);
+		return blk_ioctl(inode->i_bdev, cmd, arg);
 
 	  case BLKRRPART: /* Re-read partition tables */
 	        if (!capable(CAP_SYS_ADMIN)) 

drivers/block/ataflop.c

@@ -1574,7 +1574,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
 		case BLKROSET:
 		case BLKROGET:
 		case BLKFLSBUF:
-			return blk_ioctl(device, cmd, param);
+			return blk_ioctl(inode->i_bdev, cmd, param);
 	}
 	drive = minor (device);
 	type  = drive >> 2;

drivers/block/blkpg.c

@@ -200,16 +200,14 @@ int blkpg_ioctl(kdev_t dev, struct blkpg_ioctl_arg *arg)
  * Common ioctl's for block devices
  */
 extern int block_ioctl(kdev_t dev, unsigned int cmd, unsigned long arg);
-int blk_ioctl(kdev_t dev, unsigned int cmd, unsigned long arg)
+int blk_ioctl(struct block_device *bdev, unsigned int cmd, unsigned long arg)
 {
 	request_queue_t *q;
 	struct gendisk *g;
 	u64 ullval = 0;
 	int intval;
 	unsigned short usval;
-
-	if (kdev_none(dev))
-		return -EINVAL;
+	kdev_t dev = to_kdev_t(bdev->bd_dev);
 
 	intval = block_ioctl(dev, cmd, arg);
 	if (intval != -ENOTTY)

drivers/block/cciss.c

@@ -469,7 +469,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
 	case BLKROSET:
 	case BLKROGET:
 	case BLKPG:
-		return blk_ioctl(inode->i_rdev, cmd, arg);
+		return blk_ioctl(inode->i_bdev, cmd, arg);
 	case CCISS_GETPCIINFO:
 	{
 		cciss_pci_info_struct pciinfo;

drivers/block/cpqarray.c

@@ -1179,7 +1179,7 @@ static int ida_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
 	case BLKROSET:
 	case BLKROGET:
 	case BLKPG:
-		return blk_ioctl(inode->i_rdev, cmd, arg);
+		return blk_ioctl(inode->i_bdev, cmd, arg);
 
 	default:
 		return -EINVAL;

drivers/block/floppy.c

@@ -3449,7 +3449,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
 		case BLKROSET:
 		case BLKROGET:
 		case BLKFLSBUF:
-			return blk_ioctl(device, cmd, param);
+			return blk_ioctl(inode->i_bdev, cmd, param);
 	}
 	type = TYPE(device);
 	drive = DRIVE(device);

drivers/block/loop.c

@@ -852,7 +852,7 @@ static int lo_ioctl(struct inode * inode, struct file * file,
 		break;
 	case BLKBSZGET:
 	case BLKBSZSET:
-		err = blk_ioctl(inode->i_rdev, cmd, arg);
+		err = blk_ioctl(inode->i_bdev, cmd, arg);
 		break;
 	default:
 		err = lo->ioctl ? lo->ioctl(lo, cmd, arg) : -EINVAL;

drivers/block/paride/pd.c

@@ -481,7 +481,7 @@ static int pd_ioctl(struct inode *inode,struct file *file,
 	    case BLKROGET:
 	    case BLKFLSBUF:
 	    case BLKPG:
-		return blk_ioctl(inode->i_rdev, cmd, arg);
+		return blk_ioctl(inode->i_bdev, cmd, arg);
 	    default:
 		return -EINVAL;
 	}

drivers/block/paride/pf.c

@@ -433,7 +433,7 @@ static int pf_ioctl(struct inode *inode,struct file *file,
 	    case BLKROSET:
 	    case BLKROGET:
 	    case BLKFLSBUF:
-		return blk_ioctl(inode->i_rdev, cmd, arg);
+		return blk_ioctl(inode->i_bdev, cmd, arg);
             default:
                 return -EINVAL;
         }

drivers/block/ps2esdi.c

@@ -1111,7 +1111,7 @@ static int ps2esdi_ioctl(struct inode *inode,
 		case BLKBSZGET:
 		case BLKBSZSET:
 		case BLKPG:
-			return blk_ioctl(inode->i_rdev, cmd, arg);
+			return blk_ioctl(inode->i_bdev, cmd, arg);
 		}
 	return (-EINVAL);
 }

drivers/block/rd.c

@@ -311,7 +311,7 @@ static int rd_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
 		case BLKROSET:
 		case BLKROGET:
 		case BLKSSZGET:
-			error = blk_ioctl(inode->i_rdev, cmd, arg);
+			error = blk_ioctl(inode->i_bdev, cmd, arg);
 	};
 out:
 	return error;

drivers/block/xd.c

@@ -355,7 +355,7 @@ static int xd_ioctl (struct inode *inode,struct file *file,u_int cmd,u_long arg)
 		case BLKROSET:
 		case BLKROGET:
 		case BLKPG:
-			return blk_ioctl(inode->i_rdev, cmd, arg);
+			return blk_ioctl(inode->i_bdev, cmd, arg);
 
 		default:
 			return -EINVAL;

drivers/cdrom/cdrom.c

@@ -1729,7 +1729,7 @@ int cdrom_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
 	case BLKROGET:
 	case BLKFLSBUF:
 	case BLKSSZGET:
-		return blk_ioctl(ip->i_rdev, cmd, arg);
+		return blk_ioctl(ip->i_bdev, cmd, arg);
 	case CDROMSUBCHNL: {
 		struct cdrom_subchnl q;
 		u_char requested, back;

drivers/ide/hd.c

@@ -654,7 +654,7 @@ static int hd_ioctl(struct inode * inode, struct file * file,
 		case BLKROGET:
 		case BLKFLSBUF:
 		case BLKPG:
-			return blk_ioctl(inode->i_rdev, cmd, arg);
+			return blk_ioctl(inode->i_bdev, cmd, arg);
 
 		default:
 			return -EINVAL;

drivers/ide/hptraid.c

@@ -126,7 +126,7 @@ static int hptraid_ioctl(struct inode *inode, struct file *file, unsigned int cm
 		case BLKROSET:
 		case BLKROGET:
 		case BLKSSZGET:
-			return blk_ioctl(inode->i_rdev, cmd, arg);
+			return blk_ioctl(inode->i_bdev, cmd, arg);
 
 		default:
 			return -EINVAL;

drivers/ide/ide.c

@@ -2842,7 +2842,7 @@ static int ide_ioctl (struct inode *inode, struct file *file,
 		case BLKELVSET:
 		case BLKBSZGET:
 		case BLKBSZSET:
-			return blk_ioctl(inode->i_rdev, cmd, arg);
+			return blk_ioctl(inode->i_bdev, cmd, arg);
 
 		/*
 		 * uniform packet command handling

drivers/ide/pdcraid.c

@@ -148,7 +148,7 @@ static int pdcraid_ioctl(struct inode *inode, struct file *file, unsigned int cm
 		case BLKROSET:
 		case BLKROGET:
 		case BLKSSZGET:
-			return blk_ioctl(inode->i_rdev, cmd, arg);
+			return blk_ioctl(inode->i_bdev, cmd, arg);
 
 		default:
 			printk("Invalid ioctl \n");

drivers/md/md.c

@@ -2625,7 +2625,7 @@ static int md_ioctl(struct inode *inode, struct file *file,
 		case BLKFLSBUF:
 		case BLKBSZGET:
 		case BLKBSZSET:
-			err = blk_ioctl(dev, cmd, arg);
+			err = blk_ioctl(inode->i_bdev, cmd, arg);
 			goto abort;
 
 		default:;

drivers/message/i2o/i2o_block.c

@@ -1105,7 +1105,7 @@ static int i2ob_ioctl(struct inode *inode, struct file *file,
 		case BLKROSET:
 		case BLKROGET:
 		case BLKPG:
-			return blk_ioctl(inode->i_rdev, cmd, arg);
+			return blk_ioctl(inode->i_bdev, cmd, arg);
 			
 		default:
 			return -EINVAL;

drivers/mtd/ftl.c

@@ -1144,7 +1144,7 @@ static int ftl_ioctl(struct inode *inode, struct file *file,
     case BLKROSET:
     case BLKROGET:
     case BLKFLSBUF:
-	ret = blk_ioctl(inode->i_rdev, cmd, arg);
+	ret = blk_ioctl(inode->i_bdev, cmd, arg);
 	break;
     default:
 	ret = -EINVAL;

drivers/mtd/nftlcore.c

@@ -823,7 +823,7 @@ static int nftl_ioctl(struct inode * inode, struct file * file, unsigned int cmd
 	case BLKROSET:
 	case BLKROGET:
 	case BLKSSZGET:
-		return blk_ioctl(inode->i_rdev, cmd, arg);
+		return blk_ioctl(inode->i_bdev, cmd, arg);
 #endif
 
 	default:

drivers/s390/block/dasd.c

@@ -2477,7 +2477,7 @@ do_dasd_ioctl (struct inode *inp, /* unsigned */ int no, unsigned long data)
 			rc = -EFAULT;
 		} else {
 			if ( bsz >= device->sizes.bp_block )
-				rc = blk_ioctl (inp->i_rdev, no, data);
+				rc = blk_ioctl (inp->i_bdev, no, data);
 			else
 				rc = -EINVAL; 
 		}
@@ -2493,7 +2493,7 @@ do_dasd_ioctl (struct inode *inp, /* unsigned */ int no, unsigned long data)
 	case BLKPG:
 	case BLKELVGET:
 	case BLKELVSET:
-		return blk_ioctl (inp->i_rdev, no, data);
+		return blk_ioctl (inp->i_bdev, no, data);
 		break;
 	default:{
 

drivers/sbus/char/jsflash.c

@@ -468,7 +468,7 @@ static int jsfd_ioctl(struct inode *inode, struct file *file,
 	case BLKROSET:
 	case BLKROGET:
 	case BLKSSZGET:
-		return blk_ioctl(inode->i_rdev, cmd, arg);
+		return blk_ioctl(inode->i_bdev, cmd, arg);
 #endif
 
 	/* case BLKFLSBUF: */	/* Program, then read, what happens? Stale? */

drivers/scsi/sd.c

@@ -235,7 +235,7 @@ static int sd_ioctl(struct inode * inode, struct file * file, unsigned int cmd,
                 case BLKELVSET:
 		case BLKBSZGET:
 		case BLKBSZSET:
-			return blk_ioctl(inode->i_rdev, cmd, arg);
+			return blk_ioctl(inode->i_bdev, cmd, arg);
 
 		case BLKRRPART: /* Re-read partition tables */
 		        if (!capable(CAP_SYS_ADMIN))

include/linux/blkpg.h

@@ -57,7 +57,7 @@ struct blkpg_partition {
 #ifdef __KERNEL__
 
 extern char * partition_name(kdev_t dev);
-extern int blk_ioctl(kdev_t dev, unsigned int cmd, unsigned long arg);
+extern int blk_ioctl(struct block_device *bdev, unsigned int cmd, unsigned long arg);
 
 #endif /* __KERNEL__ */