block: kill request_queue_t

[linux-2.6-omap-h63xx.git] / include / linux / blkdev.h

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index c09696a90d6a2149e22088a8ead1cecb9f5a082b..6a3da6717135d62dc4b581dc84f920a6ac1cc0d8 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -23,7 +23,6 @@
 struct scsi_ioctl_command;
 
 struct request_queue;
-typedef struct request_queue request_queue_t __deprecated;
 struct elevator_queue;
 typedef struct elevator_queue elevator_t;
 struct request_pm_state;
@@ -410,6 +409,16 @@ struct request_queue
 #define QUEUE_FLAG_BIDI                9       /* queue supports bidi requests */
 #define QUEUE_FLAG_NOMERGES    10      /* disable merge attempts */
 
+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,
                                           struct request_queue *q)
 {
@@ -418,7 +427,7 @@ static inline void queue_flag_set_unlocked(unsigned int flag,
 
 static inline void queue_flag_set(unsigned int flag, struct request_queue *q)
 {
-       WARN_ON_ONCE(!spin_is_locked(q->queue_lock));
+       WARN_ON_ONCE(!queue_is_locked(q));
        __set_bit(flag, &q->queue_flags);
 }
 
@@ -430,7 +439,7 @@ static inline void queue_flag_clear_unlocked(unsigned int flag,
 
 static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)
 {
-       WARN_ON_ONCE(!spin_is_locked(q->queue_lock));
+       WARN_ON_ONCE(!queue_is_locked(q));
        __clear_bit(flag, &q->queue_flags);
 }