block: remove the queue_lock indirection

With the legacy request path gone there is no good reason to keep
queue_lock as a pointer, we can always use the embedded lock now.

Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

Fixed floppy and blk-cgroup missing conversions and half done edits.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 1 insertions, 7 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index c4a3a660e3f0..1d185f1fc333 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -446,13 +446,7 @@ struct request_queue {
          */
         gfp_t                   bounce_gfp;
 
-        /*
-         * protects queue structures from reentrancy. ->__queue_lock should
-         * _never_ be used directly, it is queue private. always use
-         * ->queue_lock.
-         */
-        spinlock_t              __queue_lock;
-        spinlock_t              *queue_lock;
+        spinlock_t              queue_lock;
 
         /*
          * queue kobject