leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm rq: remove unused arguments from rq_completed()

Browse Source 
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Mike Snitzer 2018-11-08 14:59:41 -05:00
parent 24113d4878
commit 2adc5c559a
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/md/dm-rq.c
View File

@ -128,7 +128,7 @@ static void rq_end_stats(struct mapped_device *md, struct request *orig)
* the md may be freed in dm_put() at the end of this function. * the md may be freed in dm_put() at the end of this function.
* Or do dm_get() before calling this function and dm_put() later. * Or do dm_get() before calling this function and dm_put() later.
*/ */
static void rq_completed(struct mapped_device *md, int rw, bool run_queue) static void rq_completed(struct mapped_device *md)
{ {
/* nudge anyone waiting on suspend queue */ /* nudge anyone waiting on suspend queue */
if (unlikely(waitqueue_active(&md->wait))) if (unlikely(waitqueue_active(&md->wait)))
@ -147,7 +147,6 @@ static void rq_completed(struct mapped_device *md, int rw, bool run_queue)
*/ */
static void dm_end_request(struct request *clone, blk_status_t error) static void dm_end_request(struct request *clone, blk_status_t error)
{ {
int rw = rq_data_dir(clone);
struct dm_rq_target_io *tio = clone->end_io_data; struct dm_rq_target_io *tio = clone->end_io_data;
struct mapped_device *md = tio->md; struct mapped_device *md = tio->md;
struct request *rq = tio->orig; struct request *rq = tio->orig;
@ -157,7 +156,7 @@ static void dm_end_request(struct request *clone, blk_status_t error)
rq_end_stats(md, rq); rq_end_stats(md, rq);
blk_mq_end_request(rq, error); blk_mq_end_request(rq, error);
rq_completed(md, rw, true); rq_completed(md);
} }
static void __dm_mq_kick_requeue_list(struct request_queue *q, unsigned long msecs) static void __dm_mq_kick_requeue_list(struct request_queue *q, unsigned long msecs)
@ -181,7 +180,6 @@ static void dm_requeue_original_request(struct dm_rq_target_io *tio, bool delay_
{ {
struct mapped_device *md = tio->md; struct mapped_device *md = tio->md;
struct request *rq = tio->orig; struct request *rq = tio->orig;
int rw = rq_data_dir(rq);
unsigned long delay_ms = delay_requeue ? 100 : 0; unsigned long delay_ms = delay_requeue ? 100 : 0;
rq_end_stats(md, rq); rq_end_stats(md, rq);
@ -191,7 +189,7 @@ static void dm_requeue_original_request(struct dm_rq_target_io *tio, bool delay_
} }
dm_mq_delay_requeue_request(rq, delay_ms); dm_mq_delay_requeue_request(rq, delay_ms);
rq_completed(md, rw, false); rq_completed(md);
} }
static void dm_done(struct request *clone, blk_status_t error, bool mapped) static void dm_done(struct request *clone, blk_status_t error, bool mapped)
@ -246,15 +244,13 @@ static void dm_softirq_done(struct request *rq)
bool mapped = true; bool mapped = true;
struct dm_rq_target_io *tio = tio_from_request(rq); struct dm_rq_target_io *tio = tio_from_request(rq);
struct request *clone = tio->clone; struct request *clone = tio->clone;
int rw;
if (!clone) { if (!clone) {
struct mapped_device *md = tio->md; struct mapped_device *md = tio->md;
rq_end_stats(md, rq); rq_end_stats(md, rq);
rw = rq_data_dir(rq);
blk_mq_end_request(rq, tio->error); blk_mq_end_request(rq, tio->error);
rq_completed(md, rw, false); rq_completed(md);
return; return;
} }
@ -507,7 +503,7 @@ static blk_status_t dm_mq_queue_rq(struct blk_mq_hw_ctx *hctx,
if (map_request(tio) == DM_MAPIO_REQUEUE) { if (map_request(tio) == DM_MAPIO_REQUEUE) {
/* Undo dm_start_request() before requeuing */ /* Undo dm_start_request() before requeuing */
rq_end_stats(md, rq); rq_end_stats(md, rq);
rq_completed(md, rq_data_dir(rq), false); rq_completed(md);
return BLK_STS_RESOURCE; return BLK_STS_RESOURCE;
} }