X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=block%2Fblk.h;h=e38691dbb329f1f6fcb8d135fef4cc541c148b4e;hp=3f6551b3c92d7fa14edc1b1d85c1ef500561e789;hb=refs%2Fheads%2Fpandora-3.2-hugetlb;hpb=4d18de944954b973fede3259d206022f90549269 diff --git a/block/blk.h b/block/blk.h index 3f6551b3c92d..e38691dbb329 100644 --- a/block/blk.h +++ b/block/blk.h @@ -85,7 +85,7 @@ static inline struct request *__elv_next_request(struct request_queue *q) q->flush_queue_delayed = 1; return NULL; } - if (test_bit(QUEUE_FLAG_DEAD, &q->queue_flags) || + if (unlikely(blk_queue_dead(q)) || !q->elevator->ops->elevator_dispatch_fn(q, 0)) return NULL; }