projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fuse: check connected before queueing on fpq->io
[linux-2.6-microblaze.git]
/
block
/
mq-deadline.c
diff --git
a/block/mq-deadline.c
b/block/mq-deadline.c
index
04aded7
..
8eea2cb
100644
(file)
--- a/
block/mq-deadline.c
+++ b/
block/mq-deadline.c
@@
-461,10
+461,9
@@
static int dd_request_merge(struct request_queue *q, struct request **rq,
return ELEVATOR_NO_MERGE;
}
return ELEVATOR_NO_MERGE;
}
-static bool dd_bio_merge(struct
blk_mq_hw_ctx *hctx
, struct bio *bio,
+static bool dd_bio_merge(struct
request_queue *q
, struct bio *bio,
unsigned int nr_segs)
{
unsigned int nr_segs)
{
- struct request_queue *q = hctx->queue;
struct deadline_data *dd = q->elevator->elevator_data;
struct request *free = NULL;
bool ret;
struct deadline_data *dd = q->elevator->elevator_data;
struct request *free = NULL;
bool ret;