projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'mkp-scsi/4.9/scsi-fixes' into fixes
[cascardo/linux.git]
/
drivers
/
block
/
loop.c
diff --git
a/drivers/block/loop.c
b/drivers/block/loop.c
index
c9f2107
..
fa1b7a9
100644
(file)
--- a/
drivers/block/loop.c
+++ b/
drivers/block/loop.c
@@
-840,13
+840,13
@@
static void loop_config_discard(struct loop_device *lo)
static void loop_unprepare_queue(struct loop_device *lo)
{
static void loop_unprepare_queue(struct loop_device *lo)
{
-
flush_kthread
_worker(&lo->worker);
+
kthread_flush
_worker(&lo->worker);
kthread_stop(lo->worker_task);
}
static int loop_prepare_queue(struct loop_device *lo)
{
kthread_stop(lo->worker_task);
}
static int loop_prepare_queue(struct loop_device *lo)
{
-
init_kthread
_worker(&lo->worker);
+
kthread_init
_worker(&lo->worker);
lo->worker_task = kthread_run(kthread_worker_fn,
&lo->worker, "loop%d", lo->lo_number);
if (IS_ERR(lo->worker_task))
lo->worker_task = kthread_run(kthread_worker_fn,
&lo->worker, "loop%d", lo->lo_number);
if (IS_ERR(lo->worker_task))
@@
-1658,7
+1658,7
@@
static int loop_queue_rq(struct blk_mq_hw_ctx *hctx,
break;
}
break;
}
-
queue_kthread
_work(&lo->worker, &cmd->work);
+
kthread_queue
_work(&lo->worker, &cmd->work);
return BLK_MQ_RQ_QUEUE_OK;
}
return BLK_MQ_RQ_QUEUE_OK;
}
@@
-1696,14
+1696,13
@@
static int loop_init_request(void *data, struct request *rq,
struct loop_cmd *cmd = blk_mq_rq_to_pdu(rq);
cmd->rq = rq;
struct loop_cmd *cmd = blk_mq_rq_to_pdu(rq);
cmd->rq = rq;
-
init_kthread
_work(&cmd->work, loop_queue_work);
+
kthread_init
_work(&cmd->work, loop_queue_work);
return 0;
}
static struct blk_mq_ops loop_mq_ops = {
.queue_rq = loop_queue_rq,
return 0;
}
static struct blk_mq_ops loop_mq_ops = {
.queue_rq = loop_queue_rq,
- .map_queue = blk_mq_map_queue,
.init_request = loop_init_request,
};
.init_request = loop_init_request,
};