block: always assign default lock to queues

[linux-block.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index 4b45435c6eaf2b3b714f2ce50606a0b053ee63f3..a0c340d239b0d42695d2bcbc0145c977f9c5dc81 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -575,13 +575,6 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)
                return NULL;
        }
 
-       /*
-        * if caller didn't supply a lock, they get per-queue locking with
-        * our embedded lock
-        */
-       if (!lock)
-               lock = &q->__queue_lock;
-
        q->request_fn           = rfn;
        q->prep_rq_fn           = NULL;
        q->unplug_fn            = generic_unplug_device;