diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2015-04-29 12:07:12 -0400 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2015-05-29 14:18:57 -0400 |
| commit | 2d76fff18fd12284493456b01c998e540b140c23 (patch) | |
| tree | 3c18b38e8639edccc10446ea1721d46a1a633d0a /drivers | |
| parent | cbc4e3c1350beb47beab8f34ad9be3d34a20c705 (diff) | |
| download | lwn-2d76fff18fd12284493456b01c998e540b140c23.tar.gz lwn-2d76fff18fd12284493456b01c998e540b140c23.zip | |
dm: cleanup methods that requeue requests
More often than not a request that is requeued _is_ mapped (meaning the
clone request is allocated and clone->q is initialized). Rename
dm_requeue_unmapped_original_request() to avoid potential confusion due
to function name containing "unmapped".
Also, remove dm_requeue_unmapped_request() since callers can easily call
the dm_requeue_original_request() directly.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/dm.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 916f6015981c..4b6cb1220182 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1113,8 +1113,8 @@ static void old_requeue_request(struct request *rq) spin_unlock_irqrestore(q->queue_lock, flags); } -static void dm_requeue_unmapped_original_request(struct mapped_device *md, - struct request *rq) +static void dm_requeue_original_request(struct mapped_device *md, + struct request *rq) { int rw = rq_data_dir(rq); @@ -1130,13 +1130,6 @@ static void dm_requeue_unmapped_original_request(struct mapped_device *md, rq_completed(md, rw, false); } -static void dm_requeue_unmapped_request(struct request *clone) -{ - struct dm_rq_target_io *tio = clone->end_io_data; - - dm_requeue_unmapped_original_request(tio->md, tio->orig); -} - static void old_stop_queue(struct request_queue *q) { unsigned long flags; @@ -1200,7 +1193,7 @@ static void dm_done(struct request *clone, int error, bool mapped) return; else if (r == DM_ENDIO_REQUEUE) /* The target wants to requeue the I/O */ - dm_requeue_unmapped_request(clone); + dm_requeue_original_request(tio->md, tio->orig); else { DMWARN("unimplemented target endio return value: %d", r); BUG(); @@ -1910,7 +1903,7 @@ static int map_request(struct dm_rq_target_io *tio, struct request *rq, break; case DM_MAPIO_REQUEUE: /* The target wants to requeue the I/O */ - dm_requeue_unmapped_request(clone); + dm_requeue_original_request(md, tio->orig); break; default: if (r > 0) { @@ -1933,7 +1926,7 @@ static void map_tio_request(struct kthread_work *work) struct mapped_device *md = tio->md; if (map_request(tio, rq, md) == DM_MAPIO_REQUEUE) - dm_requeue_unmapped_original_request(md, rq); + dm_requeue_original_request(md, rq); } static void dm_start_request(struct mapped_device *md, struct request *orig) |