aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2008-04-29 21:31:27 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 12:36:54 -0700
commit7663c1e2792a9662b23dec6e19bfcd3d55360b8f (patch)
treeff5f91fa9ac3603f242b8ae985d9cca611e3d56b
parent6203554207728f43cfb9fd48585cd6500da73d42 (diff)
downloadmrst-s0i3-test-7663c1e2792a9662b23dec6e19bfcd3d55360b8f.tar.gz
mrst-s0i3-test-7663c1e2792a9662b23dec6e19bfcd3d55360b8f.tar.xz
mrst-s0i3-test-7663c1e2792a9662b23dec6e19bfcd3d55360b8f.zip
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>
-rw-r--r--include/linux/blkdev.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 95864b3ff29..d2a1b71e93c 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -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,