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
block: change ->make_request_fn() and users to return a queue cookie
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
block
/
umem.c
diff --git
a/drivers/block/umem.c
b/drivers/block/umem.c
index 04d65790a8862a91be1d1b40f8baef7f850824d6..7939b9f8744135d137e222c6593cc0a96b94c18a 100644
(file)
--- a/
drivers/block/umem.c
+++ b/
drivers/block/umem.c
@@
-524,7
+524,7
@@
static int mm_check_plugged(struct cardinfo *card)
return !!blk_check_plugged(mm_unplug, card, sizeof(struct blk_plug_cb));
}
return !!blk_check_plugged(mm_unplug, card, sizeof(struct blk_plug_cb));
}
-static
void
mm_make_request(struct request_queue *q, struct bio *bio)
+static
blk_qc_t
mm_make_request(struct request_queue *q, struct bio *bio)
{
struct cardinfo *card = q->queuedata;
pr_debug("mm_make_request %llu %u\n",
{
struct cardinfo *card = q->queuedata;
pr_debug("mm_make_request %llu %u\n",
@@
-541,7
+541,7
@@
static void mm_make_request(struct request_queue *q, struct bio *bio)
activate(card);
spin_unlock_irq(&card->lock);
activate(card);
spin_unlock_irq(&card->lock);
- return;
+ return
BLK_QC_T_NONE
;
}
static irqreturn_t mm_interrupt(int irq, void *__card)
}
static irqreturn_t mm_interrupt(int irq, void *__card)