Historically we always take queue_lock with irqs disabled. Blk-mq doesn't really use the queue_lock much, but when it does it needs to follow this rules to make lockdep happy.
The first patch removes a queue_lock usage instead of fixing things properly, and the second is a bad-aid for nvme. In the long run I'd prefer to remove other users of the queue_lock from blk-mq and blk-mq based driver entirely, but that will require a bit more work. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/