Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3931
b: refs/heads/master
c: fd782a4
h: refs/heads/master
i:
  3929: 2ef3245
  3927: 5f10a2a
v: v3
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed Jun 29, 2005
1 parent 21e4be6 commit c173a32
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 541cecac534ea0df95fbc76b0a3091e91b101895
refs/heads/master: fd782a4a99d2d3e818b9465c427b10f7f027d7da
5 changes: 2 additions & 3 deletions trunk/drivers/block/ll_rw_blk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
* allocated with any setting of ->nr_requests
*/
if (rl->count[rw] >= (3 * q->nr_requests / 2)) {
spin_unlock_irq(q->queue_lock);
if (rl->count[rw] >= (3 * q->nr_requests / 2))
goto out;
}

rl->count[rw]++;
rl->starved[rw] = 0;
if (rl->count[rw] >= queue_congestion_on_threshold(q))
Expand Down

0 comments on commit c173a32

Please sign in to comment.