Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md

[linux.git] / drivers / md / raid10.c

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index ade7d69234d54b3243792d182713cfec02f681aa..063c43d83b72c2f0f753edb7b08f8dd608fa15ad 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -860,7 +860,7 @@ static int raid10_congested(struct mddev *mddev, int bits)
                if (rdev && !test_bit(Faulty, &rdev->flags)) {
                        struct request_queue *q = bdev_get_queue(rdev->bdev);
 
-                       ret |= bdi_congested(&q->backing_dev_info, bits);
+                       ret |= bdi_congested(q->backing_dev_info, bits);
                }
        }
        rcu_read_unlock();
@@ -3840,8 +3840,8 @@ static int raid10_run(struct mddev *mddev)
                 * maybe...
                 */
                stripe /= conf->geo.near_copies;
-               if (mddev->queue->backing_dev_info.ra_pages < 2 * stripe)
-                       mddev->queue->backing_dev_info.ra_pages = 2 * stripe;
+               if (mddev->queue->backing_dev_info->ra_pages < 2 * stripe)
+                       mddev->queue->backing_dev_info->ra_pages = 2 * stripe;
        }
 
        if (md_integrity_register(mddev))
@@ -4642,8 +4642,8 @@ static void end_reshape(struct r10conf *conf)
                int stripe = conf->geo.raid_disks *
                        ((conf->mddev->chunk_sectors << 9) / PAGE_SIZE);
                stripe /= conf->geo.near_copies;
-               if (conf->mddev->queue->backing_dev_info.ra_pages < 2 * stripe)
-                       conf->mddev->queue->backing_dev_info.ra_pages = 2 * stripe;
+               if (conf->mddev->queue->backing_dev_info->ra_pages < 2 * stripe)
+                       conf->mddev->queue->backing_dev_info->ra_pages = 2 * stripe;
        }
        conf->fullsync = 0;
 }