Revert "block: Fix a lockdep complaint triggered by request queue flushing"
authorMing Lei <ming.lei@redhat.com>
Thu, 3 Dec 2020 01:26:38 +0000 (09:26 +0800)
committerJens Axboe <axboe@kernel.dk>
Tue, 8 Dec 2020 03:30:19 +0000 (20:30 -0700)
commit7aa390ec2d9db0cd6677d95d0b8f307f9c086770
tree11bf35198ef08b60611da39cd7fef8dda4bd5181
parent88c9979334aa5ff8c814ddf578f3113ed6c5ce8e
Revert "block: Fix a lockdep complaint triggered by request queue flushing"

This reverts commit b3c6a59975415bde29cfd76ff1ab008edbf614a9.

Now we can avoid nvme-loop lockdep warning of 'lockdep possible recursive locking'
by nvme-loop's lock class, no need to apply dynamically allocated lock class key,
so revert commit b3c6a5997541("block: Fix a lockdep complaint triggered by request
queue flushing").

This way fixes horrible SCSI probe delay issue on megaraid_sas, and it is reported
the whole probe may take more than half an hour.

Tested-by: Kashyap Desai <kashyap.desai@broadcom.com>
Reported-by: Qian Cai <cai@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Sumit Saxena <sumit.saxena@broadcom.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kashyap Desai <kashyap.desai@broadcom.com>
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: Hannes Reinecke <hare@suse.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-flush.c
block/blk.h