block: add blk_queue_dead()

[karo-tx-linux.git] / block / blk.h

diff --git a/block/blk.h b/block/blk.h
index 3f6551b3c92d7fa14edc1b1d85c1ef500561e789..e38691dbb329f1f6fcb8d135fef4cc541c148b4e 100644 (file)
--- 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;
        }