diff options
Diffstat (limited to 'drivers/md/multipath.c')
-rw-r--r-- | drivers/md/multipath.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index 14da37fee37..1e2af43a73b 100644 --- a/drivers/md/multipath.c +++ b/drivers/md/multipath.c | |||
@@ -125,7 +125,7 @@ static void unplug_slaves(mddev_t *mddev) | |||
125 | mdk_rdev_t *rdev = rcu_dereference(conf->multipaths[i].rdev); | 125 | mdk_rdev_t *rdev = rcu_dereference(conf->multipaths[i].rdev); |
126 | if (rdev && !test_bit(Faulty, &rdev->flags) | 126 | if (rdev && !test_bit(Faulty, &rdev->flags) |
127 | && atomic_read(&rdev->nr_pending)) { | 127 | && atomic_read(&rdev->nr_pending)) { |
128 | request_queue_t *r_queue = bdev_get_queue(rdev->bdev); | 128 | struct request_queue *r_queue = bdev_get_queue(rdev->bdev); |
129 | 129 | ||
130 | atomic_inc(&rdev->nr_pending); | 130 | atomic_inc(&rdev->nr_pending); |
131 | rcu_read_unlock(); | 131 | rcu_read_unlock(); |
@@ -140,13 +140,13 @@ static void unplug_slaves(mddev_t *mddev) | |||
140 | rcu_read_unlock(); | 140 | rcu_read_unlock(); |
141 | } | 141 | } |
142 | 142 | ||
143 | static void multipath_unplug(request_queue_t *q) | 143 | static void multipath_unplug(struct request_queue *q) |
144 | { | 144 | { |
145 | unplug_slaves(q->queuedata); | 145 | unplug_slaves(q->queuedata); |
146 | } | 146 | } |
147 | 147 | ||
148 | 148 | ||
149 | static int multipath_make_request (request_queue_t *q, struct bio * bio) | 149 | static int multipath_make_request (struct request_queue *q, struct bio * bio) |
150 | { | 150 | { |
151 | mddev_t *mddev = q->queuedata; | 151 | mddev_t *mddev = q->queuedata; |
152 | multipath_conf_t *conf = mddev_to_conf(mddev); | 152 | multipath_conf_t *conf = mddev_to_conf(mddev); |
@@ -199,7 +199,7 @@ static void multipath_status (struct seq_file *seq, mddev_t *mddev) | |||
199 | seq_printf (seq, "]"); | 199 | seq_printf (seq, "]"); |
200 | } | 200 | } |
201 | 201 | ||
202 | static int multipath_issue_flush(request_queue_t *q, struct gendisk *disk, | 202 | static int multipath_issue_flush(struct request_queue *q, struct gendisk *disk, |
203 | sector_t *error_sector) | 203 | sector_t *error_sector) |
204 | { | 204 | { |
205 | mddev_t *mddev = q->queuedata; | 205 | mddev_t *mddev = q->queuedata; |
@@ -211,7 +211,7 @@ static int multipath_issue_flush(request_queue_t *q, struct gendisk *disk, | |||
211 | mdk_rdev_t *rdev = rcu_dereference(conf->multipaths[i].rdev); | 211 | mdk_rdev_t *rdev = rcu_dereference(conf->multipaths[i].rdev); |
212 | if (rdev && !test_bit(Faulty, &rdev->flags)) { | 212 | if (rdev && !test_bit(Faulty, &rdev->flags)) { |
213 | struct block_device *bdev = rdev->bdev; | 213 | struct block_device *bdev = rdev->bdev; |
214 | request_queue_t *r_queue = bdev_get_queue(bdev); | 214 | struct request_queue *r_queue = bdev_get_queue(bdev); |
215 | 215 | ||
216 | if (!r_queue->issue_flush_fn) | 216 | if (!r_queue->issue_flush_fn) |
217 | ret = -EOPNOTSUPP; | 217 | ret = -EOPNOTSUPP; |
@@ -238,7 +238,7 @@ static int multipath_congested(void *data, int bits) | |||
238 | for (i = 0; i < mddev->raid_disks ; i++) { | 238 | for (i = 0; i < mddev->raid_disks ; i++) { |
239 | mdk_rdev_t *rdev = rcu_dereference(conf->multipaths[i].rdev); | 239 | mdk_rdev_t *rdev = rcu_dereference(conf->multipaths[i].rdev); |
240 | if (rdev && !test_bit(Faulty, &rdev->flags)) { | 240 | if (rdev && !test_bit(Faulty, &rdev->flags)) { |
241 | request_queue_t *q = bdev_get_queue(rdev->bdev); | 241 | struct request_queue *q = bdev_get_queue(rdev->bdev); |
242 | 242 | ||
243 | ret |= bdi_congested(&q->backing_dev_info, bits); | 243 | ret |= bdi_congested(&q->backing_dev_info, bits); |
244 | /* Just like multipath_map, we just check the | 244 | /* Just like multipath_map, we just check the |