[PATCH] (2/3) more kdev_t removals

diff --git a/drivers/acorn/block/mfmhd.c b/drivers/acorn/block/mfmhd.c
index 82fb82432ef533979fd29ec768c98ca4965983b4..b9dab9831a210e2314e1264f21941233aae70146 100644 (file)
--- a/drivers/acorn/block/mfmhd.c
+++ b/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;

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 433531d63435afc81046027343f519d7fb9609e3..d205bf2c4a8d36963212491b8e0cf1c4d588f272 100644 (file)
--- a/drivers/block/DAC960.c
+++ b/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. */

diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c
index 3721705e70e5dbade7da60c35f1c917547d626e1..85224abc2bfeeeef60dbeb48a1f5eaa3a53566e2 100644 (file)
--- a/drivers/block/acsi.c
+++ b/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)) 

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index bdc585c419ff445f8db1ea90dcbbfd54373b3812..7f18fca76d08e58d03350d711bc67c760c1062b1 100644 (file)
--- a/drivers/block/ataflop.c
+++ b/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;

diff --git a/drivers/block/blkpg.c b/drivers/block/blkpg.c
index a1f9a13a749f76255d52da7a2a304b590dbb10f5..35d3cc33d0ee6999e931dfb67fc8110410f37432 100644 (file)
--- a/drivers/block/blkpg.c
+++ b/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)

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 47d9b0808280942e551baddb91e91bdaa5c31975..d87635dd23ea7d071ddfa69900c84c9fc12dffd0 100644 (file)
--- a/drivers/block/cciss.c
+++ b/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;

diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 694a1efd4578088b42ec73a62e91840dcfbb1de8..c8cf5871273b14040a24a33a862af8e05ad5b434 100644 (file)
--- a/drivers/block/cpqarray.c
+++ b/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;

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 5359938e99e8f784c0645889c47783795ce202b1..052d2a6b8f6051b5013a75ab0e179f7f8afa0b74 100644 (file)
--- a/drivers/block/floppy.c
+++ b/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);

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index eb1f8813b4217402e605eb7618fc79ada6a1ac7f..cfce7b234c5714455141e103ec73ff56ee1908eb 100644 (file)
--- a/drivers/block/loop.c
+++ b/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;

diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 7d0f6a6a5f7a19eb45303dedc792bb3554b509b3..91cc8e3eac3500b71bdd80297b2b7b2df45f8368 100644 (file)
--- a/drivers/block/paride/pd.c
+++ b/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;
        }

diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 034705f2f1c12fa9705c6052a26cf2a221a7cae0..be857543c111510ae552a20ef384b7de52fa56f7 100644 (file)
--- a/drivers/block/paride/pf.c
+++ b/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;
         }

diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c
index 95493ea0f1fe37fa7178b97a5da911945f5303ca..79370ff0090512df28aa711ffa60991b0d4ff1a8 100644 (file)
--- a/drivers/block/ps2esdi.c
+++ b/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);
 }

diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 3edd33c306ce4dc35236bd47d2b75b12d43236bd..f9cf01e79412258d56a042067f9c0464f29e4fb2 100644 (file)
--- a/drivers/block/rd.c
+++ b/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;

diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index 30d2e864add5e9ca5e73aff5f3b19993378fcb72..76e87ad39cfd073a352e6e40bcd5336c422679f3 100644 (file)
--- a/drivers/block/xd.c
+++ b/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;

diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 319206d7e4bfab881e9ee45437055efd5ead6682..14107f29c363ee18f55b311f2e8986779ea5a0a0 100644 (file)
--- a/drivers/cdrom/cdrom.c
+++ b/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;

diff --git a/drivers/ide/hd.c b/drivers/ide/hd.c
index 71e1ffefd0c294d64152d932db69cf3023d73cb0..6c708f38ba205b1a8ec06bf015185d1038d39b9b 100644 (file)
--- a/drivers/ide/hd.c
+++ b/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;

diff --git a/drivers/ide/hptraid.c b/drivers/ide/hptraid.c
index 9a61e51128468b5073e4142241010c4f976c21bf..88f8858143fc670458f122e9827d2c207ab58994 100644 (file)
--- a/drivers/ide/hptraid.c
+++ b/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;

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index bed4ea6280caf08d47e30a69c44792f5b4bd47eb..1b1626859f26ae89c490fc18b727159a3913f182 100644 (file)
--- a/drivers/ide/ide.c
+++ b/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

diff --git a/drivers/ide/pdcraid.c b/drivers/ide/pdcraid.c
index 93e65583cac320f5eb2843c71c1b147bff591ab2..cdb18724f39d1a31a4b9084129b800444f92f26c 100644 (file)
--- a/drivers/ide/pdcraid.c
+++ b/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");

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 3bbbc201f4ee7b64ff27c6b105e7a9127fcdf0f1..e8e227b7cd9ce190b6cb39af02096a80d86c1cb7 100644 (file)
--- a/drivers/md/md.c
+++ b/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:;

diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 243b962d66ab92bfdc733e55c95c9927c363ddfe..c229b896d48a41c816d218044ea217179262e224 100644 (file)
--- a/drivers/message/i2o/i2o_block.c
+++ b/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;

diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index 8e6ce8dab20e90e9b3f8ff09e83990367c11158d..1fc63d360def9263e4583af4770b741d731f03e8 100644 (file)
--- a/drivers/mtd/ftl.c
+++ b/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;

diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index 7b41b62ad37c0efb75ef1fc418c34691a8c59289..2b60ed1319e447a190f68e64fd8b6c75fad98a29 100644 (file)
--- a/drivers/mtd/nftlcore.c
+++ b/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:

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index e5ddb0565c5a5faab3a4daf1e209e639a2fb9978..1f5259ff728c02e6ab1f626d3bdf33c057da799f 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/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:{
 

diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 05b38ff0dc9f5be380fc585b6b29994709b89bb8..a31a89a85236022baf2d4ae842a6972298e93d5b 100644 (file)
--- a/drivers/sbus/char/jsflash.c
+++ b/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? */

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index a2687c4bb82ed5500d008d4df2ae247e8eabe7e4..72f2e23fbf16a90778b4453d40fe61da8f2cff89 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/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))

diff --git a/include/linux/blkpg.h b/include/linux/blkpg.h
index 2a5e4fb82b90bd4fa18550609f0ac4456dfcd0d7..f58b6328e2bd4100e74b214ae0977ec914f7a722 100644 (file)
--- a/include/linux/blkpg.h
+++ b/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__ */