I walked through everything called from blk_free_queue and can't find anything that sleeps either, so: Reviewed-by: Christoph Hellwig <hch@xxxxxx> I wonder if we could not also revert d578c770c85233af592e54537f93f3831bde7e9a as I think that was added to avoid calling blk_put_queue from atomic context.