Improve queue_is_locked()

spin_is_locked() doesn't work on UP without spinlock debugging. Make it
safer and just return 1 on UP, so we don't get false positives. The plan
is to kill this debug function during the -rc cycle.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jens Axboe 2008-04-29 21:31:27 +02:00 committed by Linus Torvalds
parent 6203554207
commit 7663c1e279

View file

@ -412,8 +412,12 @@ struct request_queue
static inline int queue_is_locked(struct request_queue *q)
{
#ifdef CONFIG_SMP
spinlock_t *lock = q->queue_lock;
return lock && spin_is_locked(lock);
#else
return 1;
#endif
}
static inline void queue_flag_set_unlocked(unsigned int flag,