[PATCH] (4/15) big struct block_device * push (first series)

 - switch block_ioctl() to struct block_device *

diff --git a/drivers/block/blkpg.c b/drivers/block/blkpg.c
index 115cf50b14d60770ad3fe9a3a9c2924d65195e27..45460ec37ce2a19c64218ab6bb42584c6d239977 100644 (file)
--- a/drivers/block/blkpg.c
+++ b/drivers/block/blkpg.c
@@ -211,7 +211,6 @@ int blkpg_ioctl(struct block_device *bdev, 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(struct block_device *bdev, unsigned int cmd, unsigned long arg)
 {
        request_queue_t *q;
@@ -221,7 +220,7 @@ int blk_ioctl(struct block_device *bdev, unsigned int cmd, unsigned long arg)
        kdev_t dev = to_kdev_t(bdev->bd_dev);
        int holder;
 
-       intval = block_ioctl(dev, cmd, arg);
+       intval = block_ioctl(bdev, cmd, arg);
        if (intval != -ENOTTY)
                return intval;
 

diff --git a/drivers/block/block_ioctl.c b/drivers/block/block_ioctl.c
index 60b2fb3c0c6423c200cec7b5228ff79aef32e51c..6c204d48ea53b8e07a14e318ae92da8d93efd511 100644 (file)
--- a/drivers/block/block_ioctl.c
+++ b/drivers/block/block_ioctl.c
@@ -51,13 +51,13 @@ int blk_do_rq(request_queue_t *q, struct request *rq)
        return err;
 }
 
-int block_ioctl(kdev_t dev, unsigned int cmd, unsigned long arg)
+int block_ioctl(struct block_device *bdev, unsigned int cmd, unsigned long arg)
 {
        request_queue_t *q;
        struct request *rq;
        int close = 0, err;
 
-       q = blk_get_queue(dev);
+       q = blk_get_queue(to_kdev_t(bdev->bd_dev));
        if (!q)
                return -ENXIO;
 

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index b38232584a93bdda6aa598066d2ef6f61203dbf2..7563f7331a8213a67bead100ef262d92e4511d30 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -2572,7 +2572,7 @@ static int ide_ioctl (struct inode *inode, struct file *file,
                 */
                case CDROMEJECT:
                case CDROMCLOSETRAY:
-                       return block_ioctl(inode->i_rdev, cmd, arg);
+                       return block_ioctl(inode->i_bdev, cmd, arg);
 
                case HDIO_GET_BUSSTATE:
                        if (!capable(CAP_SYS_ADMIN))

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 777795ef83c875052be125a29e10af49c4d1280b..b415b4e31a4942ad046a173538155f17aec6c9b2 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -291,7 +291,7 @@ extern void blk_plug_device(request_queue_t *);
 extern void blk_recount_segments(request_queue_t *, struct bio *);
 extern inline int blk_phys_contig_segment(request_queue_t *q, struct bio *, struct bio *);
 extern inline int blk_hw_contig_segment(request_queue_t *q, struct bio *, struct bio *);
-extern int block_ioctl(kdev_t, unsigned int, unsigned long);
+extern int block_ioctl(struct block_device *, unsigned int, unsigned long);
 extern int ll_10byte_cmd_build(request_queue_t *, struct request *);
 
 /*