From 4d5ebfe2b139a1980a028f4165985ba8910f43bf Mon Sep 17 00:00:00 2001 From: Paolo Valente Date: Wed, 28 Jul 2010 14:47:17 +0200 Subject: [PATCH] BUGFIX: replaced spinlock check broken without SMP Replaced calls to spin_is_locked, which does not work if CONFIG_SMP is not set, with assert_spin_locked Signed-off-by: Paolo Valente --- block/bfq-cgroup.c | 2 +- block/bfq-iosched.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index 594dc77..9b2e0d1 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c @@ -162,7 +162,7 @@ static void bfq_group_chain_link(struct bfq_data *bfqd, struct cgroup *cgroup, struct bfq_group *bfqg, *next, *prev = NULL; unsigned long flags; - BUG_ON(!spin_is_locked(bfqd->queue->queue_lock)); + assert_spin_locked(bfqd->queue->queue_lock); for (; cgroup != NULL && leaf != NULL; cgroup = cgroup->parent) { bgrp = cgroup_to_bfqio(cgroup); diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 0399cba..54a40c1 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -1647,7 +1647,7 @@ static void bfq_insert_request(struct request_queue *q, struct request *rq) struct bfq_data *bfqd = q->elevator->elevator_data; struct bfq_queue *bfqq = RQ_BFQQ(rq); - BUG_ON(!spin_is_locked(bfqd->queue->queue_lock)); + assert_spin_locked(bfqd->queue->queue_lock); bfq_init_prio_data(bfqq, RQ_CIC(rq)->ioc); bfq_add_rq_rb(rq); -- 1.7.0.4