[PATCH] kdev_t -> bdev cleanups [1/2]

 - kill the last caller of get_hardsect_size() (switching it to
   bdev_hardsect_size()).

 - kill blk_get_queue() and switching to bdev_get_queue()

7 files changed, 16 insertions, 27 deletions

diff --git a/drivers/block/blkpg.c b/drivers/block/blkpg.c
index e11f7d3283d2..d4826ab849f8 100644
--- a/drivers/block/blkpg.c
+++ b/drivers/block/blkpg.c
@@ -260,7 +260,7 @@ int blk_ioctl(struct block_device *bdev, unsigned int cmd, unsigned long arg)
 						(long *)arg);
 
 		case BLKSECTGET:
-			if ((q = blk_get_queue(dev)) == NULL)
+			if ((q = bdev_get_queue(bdev)) == NULL)
 				return -EINVAL;
 
 			usval = q->max_sectors;
diff --git a/drivers/block/block_ioctl.c b/drivers/block/block_ioctl.c
index 7801e021c1bf..edde76503d60 100644
--- a/drivers/block/block_ioctl.c
+++ b/drivers/block/block_ioctl.c
@@ -56,7 +56,7 @@ int block_ioctl(struct block_device *bdev, unsigned int cmd, unsigned long arg)
 	struct request *rq;
 	int close = 0, err;
 
-	q = blk_get_queue(to_kdev_t(bdev->bd_dev));
+	q = bdev_get_queue(bdev);
 	if (!q)
 		return -ENXIO;
 
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index 87c53a81ef22..c39545712ba7 100644
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -80,8 +80,8 @@ unsigned long blk_max_low_pfn, blk_max_pfn;
 int blk_nohighio = 0;
 
 /**
- * blk_get_queue: - return the queue that matches the given device
- * @dev:    device
+ * bdev_get_queue: - return the queue that matches the given device
+ * @bdev:    device
  *
  * Description:
  *     Given a specific device, return the queue that will hold I/O
@@ -90,12 +90,12 @@ int blk_nohighio = 0;
  *     stored in the same location.
  *
  **/
-inline request_queue_t *blk_get_queue(kdev_t dev)
+inline request_queue_t *bdev_get_queue(struct block_device *bdev)
 {
-	struct blk_dev_struct *bdev = blk_dev + major(dev);
-
-	if (bdev->queue)
-		return bdev->queue(dev);
+	kdev_t dev = to_kdev_t(bdev->bd_dev);
+	struct blk_dev_struct *p = blk_dev + major(dev);
+	if (p->queue)
+		return p->queue(dev);
 	else
 		return &blk_dev[major(dev)].request_queue;
 }
@@ -112,7 +112,7 @@ inline request_queue_t *blk_get_queue(kdev_t dev)
 struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev)
 {
 	struct backing_dev_info *ret = NULL;
-	request_queue_t *q = blk_get_queue(to_kdev_t(bdev->bd_dev));
+	request_queue_t *q = bdev_get_queue(bdev);
 
 	if (q)
 		ret = &q->backing_dev_info;
@@ -1482,7 +1482,7 @@ void generic_make_request(struct bio *bio)
 	 * Stacking drivers are expected to know what they are doing.
 	 */
 	do {
-		q = blk_get_queue(to_kdev_t(bio->bi_bdev->bd_dev));
+		q = bdev_get_queue(bio->bi_bdev);
 		if (!q) {
 			printk(KERN_ERR
 			       "generic_make_request: Trying to access nonexistent block-device %s (%Lu)\n",
@@ -1885,7 +1885,7 @@ int __init blk_dev_init(void)
 EXPORT_SYMBOL(end_that_request_first);
 EXPORT_SYMBOL(end_that_request_last);
 EXPORT_SYMBOL(blk_init_queue);
-EXPORT_SYMBOL(blk_get_queue);
+EXPORT_SYMBOL(bdev_get_queue);
 EXPORT_SYMBOL(blk_cleanup_queue);
 EXPORT_SYMBOL(blk_queue_make_request);
 EXPORT_SYMBOL(blk_queue_bounce_limit);
diff --git a/drivers/md/md.c b/drivers/md/md.c
index e49171bd1862..84b7e6aef0ab 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2285,7 +2285,7 @@ static int hot_generate_error(mddev_t * mddev, kdev_t dev)
 	if (!disk_active(disk))
 		return -ENODEV;
 
-	q = blk_get_queue(rdev->dev);
+	q = bdev_get_queue(rdev->bdev);
 	if (!q) {
 		MD_BUG();
 		return -ENODEV;
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 3f74662114de..78f66a60425d 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1242,11 +1242,6 @@ static int sd_init()
 	}
 
 	for (k = 0; k < N_USED_SD_MAJORS; k++) {
-		request_queue_t *q = blk_get_queue(mk_kdev(SD_MAJOR(k), 0));
-		blk_queue_hardsect_size(q, 512);
- 	}
-
-	for (k = 0; k < N_USED_SD_MAJORS; k++) {
 		int N = SCSI_DISKS_PER_MAJOR;
 
 		sd_gendisks[k] = sd_gendisk;
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 6d19c3beadf7..21c5b08eb8a4 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -56,14 +56,13 @@ static void kill_bdev(struct block_device *bdev)
 int set_blocksize(struct block_device *bdev, int size)
 {
 	int oldsize;
-	kdev_t dev = to_kdev_t(bdev->bd_dev);
 
 	/* Size must be a power of two, and between 512 and PAGE_SIZE */
 	if (size > PAGE_SIZE || size < 512 || (size & (size-1)))
 		return -EINVAL;
 
 	/* Size cannot be smaller than the size supported by the device */
-	if (size < get_hardsect_size(dev))
+	if (size < bdev_hardsect_size(bdev))
 		return -EINVAL;
 
 	oldsize = bdev->bd_block_size;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 32729e1e3c5b..bfdb755f261f 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -293,7 +293,7 @@ extern void grok_partitions(kdev_t dev, long size);
 extern int wipe_partitions(kdev_t dev);
 extern void register_disk(struct gendisk *dev, kdev_t first, unsigned minors, struct block_device_operations *ops, long size);
 extern void generic_make_request(struct bio *bio);
-extern inline request_queue_t *blk_get_queue(kdev_t dev);
+extern inline request_queue_t *bdev_get_queue(struct block_device *bdev);
 extern void blkdev_release_request(struct request *);
 extern void blk_attempt_remerge(request_queue_t *, struct request *);
 extern struct request *blk_get_request(request_queue_t *, int, int);
@@ -373,14 +373,9 @@ extern inline int queue_hardsect_size(request_queue_t *q)
 	return retval;
 }
 
-extern inline int get_hardsect_size(kdev_t dev)
-{
-	return queue_hardsect_size(blk_get_queue(dev));
-}
-
 extern inline int bdev_hardsect_size(struct block_device *bdev)
 {
-	return queue_hardsect_size(blk_get_queue(to_kdev_t(bdev->bd_dev)));
+	return queue_hardsect_size(bdev_get_queue(bdev));
 }
 
 #define blk_finished_io(nsects)	do { } while (0)