Here is my counter proposal that requeues via two lists and a work struct in the request_queue. I've also tested it with scsi-mq.