diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2015-02-23 19:10:15 -0500 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2015-03-31 12:03:49 -0400 |
| commit | d56b9b28a4a5d9e61dd99154b986e760373e2392 (patch) | |
| tree | aea0bb97d20c9457849cd57773273fe67274f81b /drivers | |
| parent | 52b09914af86fa3e728175c1125c91520e437b2f (diff) | |
dm: remove request-based DM queue's lld_busy_fn hook
DM multipath is the only caller of blk_lld_busy() -- which calls a
queue's lld_busy_fn hook. Request-based DM doesn't support stacking
multipath devices so there is no reason to register the lld_busy_fn hook
on a multipath device's queue using blk_queue_lld_busy().
As such, remove functions dm_lld_busy and dm_table_any_busy_target.
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/dm-table.c | 14 | ||||
| -rw-r--r-- | drivers/md/dm.c | 17 | ||||
| -rw-r--r-- | drivers/md/dm.h | 1 |
3 files changed, 0 insertions, 32 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 6554d9148927..057312048b68 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -1677,20 +1677,6 @@ int dm_table_any_congested(struct dm_table *t, int bdi_bits) return r; } -int dm_table_any_busy_target(struct dm_table *t) -{ - unsigned i; - struct dm_target *ti; - - for (i = 0; i < t->num_targets; i++) { - ti = t->targets + i; - if (ti->type->busy && ti->type->busy(ti)) - return 1; - } - - return 0; -} - struct mapped_device *dm_table_get_md(struct dm_table *t) { return t->md; diff --git a/drivers/md/dm.c b/drivers/md/dm.c index e7095ebb8d64..cc8aed2e3f88 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2006,22 +2006,6 @@ out: dm_put_live_table(md, srcu_idx); } -static int dm_lld_busy(struct request_queue *q) -{ - int r; - struct mapped_device *md = q->queuedata; - struct dm_table *map = dm_get_live_table_fast(md); - - if (!map || test_bit(DMF_BLOCK_IO_FOR_SUSPEND, &md->flags)) - r = 1; - else - r = dm_table_any_busy_target(map); - - dm_put_live_table_fast(md); - - return r; -} - static int dm_any_congested(void *congested_data, int bdi_bits) { int r = bdi_bits; @@ -2545,7 +2529,6 @@ static int dm_init_request_based_queue(struct mapped_device *md) dm_init_md_queue(md); blk_queue_softirq_done(md->queue, dm_softirq_done); blk_queue_prep_rq(md->queue, dm_prep_fn); - blk_queue_lld_busy(md->queue, dm_lld_busy); /* Also initialize the request-based DM worker thread */ init_kthread_worker(&md->kworker); diff --git a/drivers/md/dm.h b/drivers/md/dm.h index 59f53e79db82..db495863fa5f 100644 --- a/drivers/md/dm.h +++ b/drivers/md/dm.h @@ -70,7 +70,6 @@ void dm_table_presuspend_undo_targets(struct dm_table *t); void dm_table_postsuspend_targets(struct dm_table *t); int dm_table_resume_targets(struct dm_table *t); int dm_table_any_congested(struct dm_table *t, int bdi_bits); -int dm_table_any_busy_target(struct dm_table *t); unsigned dm_table_get_type(struct dm_table *t); struct target_type *dm_table_get_immutable_target_type(struct dm_table *t); bool dm_table_request_based(struct dm_table *t); |