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, 5 insertions, 5 deletions

diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
index 01035e718c1c..709c9cc34369 100644
--- a/drivers/md/bcache/request.c
+++ b/drivers/md/bcache/request.c
@@ -1009,7 +1009,7 @@ static int cached_dev_congested(void *data, int bits)
         struct request_queue *q = bdev_get_queue(dc->bdev);
         int ret = 0;
 
-        if (bdi_congested(&q->backing_dev_info, bits))
+        if (bdi_congested(q->backing_dev_info, bits))
                 return 1;
 
         if (cached_dev_get(dc)) {
@@ -1018,7 +1018,7 @@ static int cached_dev_congested(void *data, int bits)
 
                 for_each_cache(ca, d->c, i) {
                         q = bdev_get_queue(ca->bdev);
-                        ret |= bdi_congested(&q->backing_dev_info, bits);
+                        ret |= bdi_congested(q->backing_dev_info, bits);
                 }
 
                 cached_dev_put(dc);
@@ -1032,7 +1032,7 @@ void bch_cached_dev_request_init(struct cached_dev *dc)
         struct gendisk *g = dc->disk.disk;
 
         g->queue->make_request_fn               = cached_dev_make_request;
-        g->queue->backing_dev_info.congested_fn = cached_dev_congested;
+        g->queue->backing_dev_info->congested_fn = cached_dev_congested;
         dc->disk.cache_miss                     = cached_dev_cache_miss;
         dc->disk.ioctl                          = cached_dev_ioctl;
 }
@@ -1125,7 +1125,7 @@ static int flash_dev_congested(void *data, int bits)
 
         for_each_cache(ca, d->c, i) {
                 q = bdev_get_queue(ca->bdev);
-                ret |= bdi_congested(&q->backing_dev_info, bits);
+                ret |= bdi_congested(q->backing_dev_info, bits);
         }
 
         return ret;
@@ -1136,7 +1136,7 @@ void bch_flash_dev_request_init(struct bcache_device *d)
         struct gendisk *g = d->disk;
 
         g->queue->make_request_fn               = flash_dev_make_request;
-        g->queue->backing_dev_info.congested_fn = flash_dev_congested;
+        g->queue->backing_dev_info->congested_fn = flash_dev_congested;
         d->cache_miss                           = flash_dev_cache_miss;
         d->ioctl                                = flash_dev_ioctl;
 }