diff options
Diffstat (limited to 'block/blk-core.c')
-rw-r--r-- | block/blk-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index e0a062363937..90f22cc30799 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -1184,7 +1184,7 @@ static bool bio_attempt_front_merge(struct request_queue *q, | |||
1184 | 1184 | ||
1185 | /* | 1185 | /* |
1186 | * Attempts to merge with the plugged list in the current process. Returns | 1186 | * Attempts to merge with the plugged list in the current process. Returns |
1187 | * true if merge was succesful, otherwise false. | 1187 | * true if merge was successful, otherwise false. |
1188 | */ | 1188 | */ |
1189 | static bool attempt_plug_merge(struct task_struct *tsk, struct request_queue *q, | 1189 | static bool attempt_plug_merge(struct task_struct *tsk, struct request_queue *q, |
1190 | struct bio *bio) | 1190 | struct bio *bio) |
@@ -2163,7 +2163,7 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes) | |||
2163 | * size, something has gone terribly wrong. | 2163 | * size, something has gone terribly wrong. |
2164 | */ | 2164 | */ |
2165 | if (blk_rq_bytes(req) < blk_rq_cur_bytes(req)) { | 2165 | if (blk_rq_bytes(req) < blk_rq_cur_bytes(req)) { |
2166 | printk(KERN_ERR "blk: request botched\n"); | 2166 | blk_dump_rq_flags(req, "request botched"); |
2167 | req->__data_len = blk_rq_cur_bytes(req); | 2167 | req->__data_len = blk_rq_cur_bytes(req); |
2168 | } | 2168 | } |
2169 | 2169 | ||
@@ -2665,7 +2665,7 @@ static int plug_rq_cmp(void *priv, struct list_head *a, struct list_head *b) | |||
2665 | struct request *rqa = container_of(a, struct request, queuelist); | 2665 | struct request *rqa = container_of(a, struct request, queuelist); |
2666 | struct request *rqb = container_of(b, struct request, queuelist); | 2666 | struct request *rqb = container_of(b, struct request, queuelist); |
2667 | 2667 | ||
2668 | return !(rqa->q == rqb->q); | 2668 | return !(rqa->q <= rqb->q); |
2669 | } | 2669 | } |
2670 | 2670 | ||
2671 | static void flush_plug_list(struct blk_plug *plug) | 2671 | static void flush_plug_list(struct blk_plug *plug) |