@@ -87,6 +87,7 @@ static inline void rq_wait_init(struct rq_wait *rq_wait)
static inline int rq_qos_add(struct request_queue *q, struct rq_qos *rqos)
{
+ int err;
/*
* No IO can be in-flight when adding rqos, so freeze queue, which
* is fine since we only support rq_qos for blk-mq queue.
@@ -97,8 +98,16 @@ static inline int rq_qos_add(struct request_queue *q, struct rq_qos *rqos)
blk_mq_freeze_queue(q);
spin_lock_irq(&q->queue_lock);
- if (rq_qos_id(q, rqos->id))
- goto ebusy;
+ if (rq_qos_id(q, rqos->id)) {
+ err = -EBUSY;
+ goto err;
+ }
+
+ if (q->disk && test_bit(GD_DEAD, &q->disk->state)) {
+ err = -ENODEV;
+ goto err;
+ }
+
rqos->next = q->rq_qos;
q->rq_qos = rqos;
spin_unlock_irq(&q->queue_lock);
@@ -112,10 +121,10 @@ static inline int rq_qos_add(struct request_queue *q, struct rq_qos *rqos)
}
return 0;
-ebusy:
+err:
spin_unlock_irq(&q->queue_lock);
blk_mq_unfreeze_queue(q);
- return -EBUSY;
+ return err;
}