nvme cleanups in preparation for the multipath code

Christoph Hellwig
2017-11-02T18:28:50Z

Hi all,

below are a couple cleanup patches to prepare for the next version
of the nvme multipath code.