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

 - move the contents of bdev_get_queue() into do_open() and
   check_partitions() and cache the result in new field of struct
   block_device

 - clean it at the same places that reset ->bd_op, etc.

 - make bdev_get_queue() return cached pointer.

diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index c39545712ba7b83bddeb97476b2f21dfb043fbf7..e58351141cd09ae63ce1da3a0d60c7251b03653f 100644 (file)
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -92,12 +92,7 @@ int blk_nohighio = 0;
  **/
 inline request_queue_t *bdev_get_queue(struct block_device *bdev)
 {
-       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;
+       return bdev->bd_queue;
 }
 
 /**

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 6d90edef1c514ad85e5dc75744afe9c612fa4c28..805352f9e38b9f22bbceeaf92120ef7cd890899b 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -322,6 +322,7 @@ struct block_device *bdget(dev_t dev)
                        atomic_set(&new_bdev->bd_count,1);
                        new_bdev->bd_dev = dev;
                        new_bdev->bd_op = NULL;
+                       new_bdev->bd_queue = NULL;
                        new_bdev->bd_contains = NULL;
                        new_bdev->bd_inode = inode;
                        inode->i_mode = S_IFBLK;
@@ -607,6 +608,7 @@ static int do_open(struct block_device *bdev, struct inode *inode, struct file *
        }
        bdev->bd_inode->i_size = blkdev_size(dev);
        if (!bdev->bd_openers) {
+               struct blk_dev_struct *p = blk_dev + major(dev);
                unsigned bsize = bdev_hardsect_size(bdev);
                while (bsize < PAGE_CACHE_SIZE) {
                        if (bdev->bd_inode->i_size & bsize)
@@ -615,6 +617,10 @@ static int do_open(struct block_device *bdev, struct inode *inode, struct file *
                }
                bdev->bd_block_size = bsize;
                bdev->bd_inode->i_blkbits = blksize_bits(bsize);
+               if (p->queue)
+                       bdev->bd_queue =  p->queue(dev);
+               else
+                       bdev->bd_queue = &p->request_queue;
        }
        bdev->bd_openers++;
        unlock_kernel();
@@ -624,6 +630,7 @@ static int do_open(struct block_device *bdev, struct inode *inode, struct file *
 out2:
        if (!bdev->bd_openers) {
                bdev->bd_op = NULL;
+               bdev->bd_queue = NULL;
                bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info;
                if (bdev != bdev->bd_contains) {
                        blkdev_put(bdev->bd_contains, BDEV_RAW);
@@ -698,6 +705,7 @@ int blkdev_put(struct block_device *bdev, int kind)
                __MOD_DEC_USE_COUNT(bdev->bd_op->owner);
        if (!bdev->bd_openers) {
                bdev->bd_op = NULL;
+               bdev->bd_queue = NULL;
                bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info;
                if (bdev != bdev->bd_contains) {
                        blkdev_put(bdev->bd_contains, BDEV_RAW);

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 4af7921a903ee304c36ff984dd8994595ed4ce6b..b3fd40ddda3311d965bb6546d7c682dd76d1e792 100644 (file)
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -255,12 +255,17 @@ static void check_partition(struct gendisk *hd, kdev_t dev, int first_part_minor
        bdev->bd_contains = bdev;
        bdev->bd_inode->i_size = (loff_t)hd->part[minor(dev)].nr_sects << 9;
        if (!bdev->bd_openers) {
+               struct blk_dev_struct *p = blk_dev + major(dev);
                unsigned bsize = bdev_hardsect_size(bdev);
                while (bsize < PAGE_CACHE_SIZE) {
                        if (bdev->bd_inode->i_size & bsize)
                                break;
                        bsize <<= 1;
                }
+               if (p->queue)
+                       bdev->bd_queue =  p->queue(dev);
+               else
+                       bdev->bd_queue = &p->request_queue;
                bdev->bd_block_size = bsize;
                bdev->bd_inode->i_blkbits = blksize_bits(bsize);
        }

diff --git a/include/linux/fs.h b/include/linux/fs.h
index d593252f4825bfdfa5d41ba21ea75346ed30bcc6..0c7ec5ff6b9c611990523b42aa1fad7166953c00 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -341,6 +341,7 @@ struct block_device {
        dev_t                   bd_dev;  /* not a kdev_t - it's a search key */
        int                     bd_openers;
        const struct block_device_operations *bd_op;
+       struct request_queue    *bd_queue;
        struct semaphore        bd_sem; /* open/close mutex */
        struct list_head        bd_inodes;
        void *                  bd_holder;