Commit 05444118 authored by Tejun Heo's avatar Tejun Heo Committed by Greg Kroah-Hartman

blk-rq-qos: fix first node deletion of rq_qos_del()

commit 307f4065 upstream.

rq_qos_del() incorrectly assigns the node being deleted to the head if
it was the first on the list in the !prev path.  Fix it by iterating
with ** instead.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Josef Bacik <josef@toxicpanda.com>
Fixes: a7905043 ("blk-rq-qos: refactor out common elements of blk-wbt")
Cc: stable@vger.kernel.org # v4.19+
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ada4030
...@@ -80,16 +80,13 @@ static inline void rq_qos_add(struct request_queue *q, struct rq_qos *rqos) ...@@ -80,16 +80,13 @@ static inline void rq_qos_add(struct request_queue *q, struct rq_qos *rqos)
static inline void rq_qos_del(struct request_queue *q, struct rq_qos *rqos) static inline void rq_qos_del(struct request_queue *q, struct rq_qos *rqos)
{ {
struct rq_qos *cur, *prev = NULL; struct rq_qos **cur;
for (cur = q->rq_qos; cur; cur = cur->next) {
if (cur == rqos) { for (cur = &q->rq_qos; *cur; cur = &(*cur)->next) {
if (prev) if (*cur == rqos) {
prev->next = rqos->next; *cur = rqos->next;
else
q->rq_qos = cur;
break; break;
} }
prev = cur;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment