Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'for-linus' into for-2.6.40/core

Browse source 
This patch merges in a fix that missed 2.6.39 final.

Conflicts:
	block/blk.h
This commit is contained in:
Jens Axboe 2011-05-20 20:36:16 +02:00
commit 0eb8e88572
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
block/blk.h
View file

@ -61,6 +61,7 @@ static inline struct request *__elv_next_request(struct request_queue *q)
rq = list_entry_rq(q->queue_head.next); rq = list_entry_rq(q->queue_head.next);
return rq; return rq;
} }
/* /*
* Flush request is running and flush request isn't queueable * Flush request is running and flush request isn't queueable
* in the drive, we can hold the queue till flush request is * in the drive, we can hold the queue till flush request is
@ -81,7 +82,8 @@ static inline struct request *__elv_next_request(struct request_queue *q)
q->flush_queue_delayed = 1; q->flush_queue_delayed = 1;
return NULL; return NULL;
} }
if (!q->elevator->ops->elevator_dispatch_fn(q, 0)) if (test_bit(QUEUE_FLAG_DEAD, &q->queue_flags) ||
!q->elevator->ops->elevator_dispatch_fn(q, 0))
return NULL; return NULL;
} }
} }