nvme/pci: Fix stuck nvme reset
authorKeith Busch <keith.busch@intel.com>
Tue, 27 Jun 2017 23:44:05 +0000 (17:44 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 27 Jun 2017 23:44:05 +0000 (17:44 -0600)
commitebef7368571d88f0f80b817e6898075c62265b4e
treed38abb27b86a8f58077047372cf531bdfd7ddb2b
parent3c2bfbaadff6e0c257bb6b16c9c97f43618b13dc
nvme/pci: Fix stuck nvme reset

The controller state is set to resetting prior to disabling the
controller, so this patch accounts for that state when deciding if it
needs to freeze the queues. Without this, an 'nvme reset /dev/nvme0'
blocks forever because the queues were never frozen.

Fixes: 82b057caefaf ("nvme-pci: fix multiple ctrl removal scheduling")
Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/nvme/host/pci.c