[lkml]   [2011]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[GIT PULL] Two fixups for the block IO merge
Hi Linus,

An embarassing bug made the block IO merge a bit less enjoyable for some
people than it should have.

- The oops problem (with CFQ), or potential corruption (with noop) due
to a bad insertion type for some requests.

- A warning spew on virt_io using blk_stop_queue() inside it's callback.

Please pull these two fixes, so hopefully we can put this behind us.
Thanks a lot to the people involved with fixing the first issue.

git:// for-linus

Jens Axboe (2):
block: fix bug with inserting flush requests as sort/merge
block: fix issue with calling blk_stop_queue() from the request_fn handler

block/blk-core.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/block/blk-core.c b/block/blk-core.c
index 59b5c00..e0a0623 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -271,7 +271,7 @@ EXPORT_SYMBOL(blk_start_queue);
void blk_stop_queue(struct request_queue *q)
- cancel_delayed_work(&q->delay_work);
+ __cancel_delayed_work(&q->delay_work);
queue_flag_set(QUEUE_FLAG_STOPPED, q);
@@ -2702,7 +2702,10 @@ static void flush_plug_list(struct blk_plug *plug)
* rq is already accounted, so use raw insert
- __elv_add_request(q, rq, ELEVATOR_INSERT_SORT_MERGE);
+ if (rq->cmd_flags & (REQ_FLUSH | REQ_FUA))
+ __elv_add_request(q, rq, ELEVATOR_INSERT_FLUSH);
+ else
+ __elv_add_request(q, rq, ELEVATOR_INSERT_SORT_MERGE);

if (q) {
Jens Axboe

 \ /
  Last update: 2011-03-25 17:09    [W:0.023 / U:1.512 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site