]> www.infradead.org Git - users/jedix/linux-maple.git/commit
nvme: merge nvme_abort_req and nvme_timeout
authorChristoph Hellwig <hch@lst.de>
Thu, 22 Oct 2015 12:03:35 +0000 (14:03 +0200)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 1 Jun 2017 20:40:44 +0000 (13:40 -0700)
commit0165891a9d1cdc71a8172d78440bcf19e4c6628f
tree5349fd88c6ccf258baa3056dade59576e9e7b57b
parent913b03597ab0930b6622227f614a9291dc00cda8
nvme: merge nvme_abort_req and nvme_timeout

We want to be able to return bettern error values frmo nvme_timeout, which
is significantly easier if the two functions are merged.  Also clean up and
reduce the printk spew so that we only get one message per abort.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
(cherry picked from commit 31c7c7d2c9f17dc98a98c59c17e184bf164ee760)

Orabug: 25130845

Signed-off-by: Ashok Vairavan <ashok.vairavan@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/nvme/host/pci.c