Commit fd782a4a authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds

[PATCH] Fix get_request nastiness

get_request is now expected to be holding on to queue_lock, with interrupts
disabled, when it returns NULL; but one path forgot that, causing all kinds
of nastiness under swap load - badness backtraces, strange failures, BUGs.
Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 541cecac
...@@ -1917,10 +1917,9 @@ static struct request *get_request(request_queue_t *q, int rw, struct bio *bio, ...@@ -1917,10 +1917,9 @@ static struct request *get_request(request_queue_t *q, int rw, struct bio *bio,
* limit of requests, otherwise we could have thousands of requests * limit of requests, otherwise we could have thousands of requests
* allocated with any setting of ->nr_requests * allocated with any setting of ->nr_requests
*/ */
if (rl->count[rw] >= (3 * q->nr_requests / 2)) { if (rl->count[rw] >= (3 * q->nr_requests / 2))
spin_unlock_irq(q->queue_lock);
goto out; goto out;
}
rl->count[rw]++; rl->count[rw]++;
rl->starved[rw] = 0; rl->starved[rw] = 0;
if (rl->count[rw] >= queue_congestion_on_threshold(q)) if (rl->count[rw] >= queue_congestion_on_threshold(q))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment