block: Use pointer to backing_dev_info from request_queue

We will want to have struct backing_dev_info allocated separately from
struct request_queue. As the first step add pointer to backing_dev_info
to request_queue and convert all users touching it. No functional
changes in this patch.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 894f77342fd4..05841be1f30f 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -89,7 +89,7 @@ queue_requests_store(struct request_queue *q, const char *page, size_t count)
 
 static ssize_t queue_ra_show(struct request_queue *q, char *page)
 {
-        unsigned long ra_kb = q->backing_dev_info.ra_pages <<
+        unsigned long ra_kb = q->backing_dev_info->ra_pages <<
                                         (PAGE_SHIFT - 10);
 
         return queue_var_show(ra_kb, (page));
@@ -104,7 +104,7 @@ queue_ra_store(struct request_queue *q, const char *page, size_t count)
         if (ret < 0)
                 return ret;
 
-        q->backing_dev_info.ra_pages = ra_kb >> (PAGE_SHIFT - 10);
+        q->backing_dev_info->ra_pages = ra_kb >> (PAGE_SHIFT - 10);
 
         return ret;
 }
@@ -236,7 +236,7 @@ queue_max_sectors_store(struct request_queue *q, const char *page, size_t count)
 
         spin_lock_irq(q->queue_lock);
         q->limits.max_sectors = max_sectors_kb << 1;
-        q->backing_dev_info.io_pages = max_sectors_kb >> (PAGE_SHIFT - 10);
+        q->backing_dev_info->io_pages = max_sectors_kb >> (PAGE_SHIFT - 10);
         spin_unlock_irq(q->queue_lock);
 
         return ret;
@@ -799,7 +799,7 @@ static void blk_release_queue(struct kobject *kobj)
                 container_of(kobj, struct request_queue, kobj);
 
         wbt_exit(q);
-        bdi_exit(&q->backing_dev_info);
+        bdi_exit(q->backing_dev_info);
         blkcg_exit_queue(q);
 
         if (q->elevator) {