projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pwm/for-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
block
/
null_blk.c
diff --git
a/drivers/block/null_blk.c
b/drivers/block/null_blk.c
index 00d469c7f9f79742c659011088b144d5bf4b6bef..2671a3f02f0cfb71831b049c52da9c0f46b20848 100644
(file)
--- a/
drivers/block/null_blk.c
+++ b/
drivers/block/null_blk.c
@@
-177,7
+177,7
@@
static void end_cmd(struct nullb_cmd *cmd)
{
switch (queue_mode) {
case NULL_Q_MQ:
{
switch (queue_mode) {
case NULL_Q_MQ:
- blk_mq_end_
io
(cmd->rq, 0);
+ blk_mq_end_
request
(cmd->rq, 0);
return;
case NULL_Q_RQ:
INIT_LIST_HEAD(&cmd->rq->queuelist);
return;
case NULL_Q_RQ:
INIT_LIST_HEAD(&cmd->rq->queuelist);
@@
-313,13
+313,16
@@
static void null_request_fn(struct request_queue *q)
}
}
}
}
-static int null_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *rq)
+static int null_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *rq,
+ bool last)
{
struct nullb_cmd *cmd = blk_mq_rq_to_pdu(rq);
cmd->rq = rq;
cmd->nq = hctx->driver_data;
{
struct nullb_cmd *cmd = blk_mq_rq_to_pdu(rq);
cmd->rq = rq;
cmd->nq = hctx->driver_data;
+ blk_mq_start_request(rq);
+
null_handle_cmd(cmd);
return BLK_MQ_RQ_QUEUE_OK;
}
null_handle_cmd(cmd);
return BLK_MQ_RQ_QUEUE_OK;
}
@@
-518,6
+521,7
@@
static int null_add_dev(void)
nullb->q->queuedata = nullb;
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, nullb->q);
nullb->q->queuedata = nullb;
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, nullb->q);
+ queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, nullb->q);
disk = nullb->disk = alloc_disk_node(1, home_node);
if (!disk) {
disk = nullb->disk = alloc_disk_node(1, home_node);
if (!disk) {