projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mfd-for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
[deliverable/linux.git]
/
block
/
deadline-iosched.c
diff --git
a/block/deadline-iosched.c
b/block/deadline-iosched.c
index d0dd7882d8c7fa7ffe80ea2e9a6ad3c0f5e97a68..55e0bb6d7da796e3b526a16832914ca88fcb879f 100644
(file)
--- a/
block/deadline-iosched.c
+++ b/
block/deadline-iosched.c
@@
-137,7
+137,7
@@
deadline_merge(struct request_queue *q, struct request **req, struct bio *bio)
if (__rq) {
BUG_ON(sector != blk_rq_pos(__rq));
if (__rq) {
BUG_ON(sector != blk_rq_pos(__rq));
- if (elv_
rq
_merge_ok(__rq, bio)) {
+ if (elv_
bio
_merge_ok(__rq, bio)) {
ret = ELEVATOR_FRONT_MERGE;
goto out;
}
ret = ELEVATOR_FRONT_MERGE;
goto out;
}
@@
-173,7
+173,8
@@
deadline_merged_requests(struct request_queue *q, struct request *req,
* and move into next position (next will be deleted) in fifo
*/
if (!list_empty(&req->queuelist) && !list_empty(&next->queuelist)) {
* and move into next position (next will be deleted) in fifo
*/
if (!list_empty(&req->queuelist) && !list_empty(&next->queuelist)) {
- if (time_before(next->fifo_time, req->fifo_time)) {
+ if (time_before((unsigned long)next->fifo_time,
+ (unsigned long)req->fifo_time)) {
list_move(&req->queuelist, &next->queuelist);
req->fifo_time = next->fifo_time;
}
list_move(&req->queuelist, &next->queuelist);
req->fifo_time = next->fifo_time;
}
@@
-227,7
+228,7
@@
static inline int deadline_check_fifo(struct deadline_data *dd, int ddir)
/*
* rq is expired!
*/
/*
* rq is expired!
*/
- if (time_after_eq(jiffies, rq->fifo_time))
+ if (time_after_eq(jiffies,
(unsigned long)
rq->fifo_time))
return 1;
return 0;
return 1;
return 0;
This page took
0.024433 seconds
and
5
git commands to generate.