On Wed, Mar 28, 2018 at 09:32:14AM +0200, Christoph Hellwig wrote: > On Tue, Mar 27, 2018 at 09:39:08AM -0600, Keith Busch wrote: > > - return blk_mq_pci_map_queues(set, to_pci_dev(dev->dev), 0); > > + return blk_mq_pci_map_queues(set, to_pci_dev(dev->dev), > > + dev->num_vecs > 1); > > Can you turn this into: > > - return blk_mq_pci_map_queues(set, to_pci_dev(dev->dev), 0); > dev->num_vecs > 1 ? 1 /* admin queue */ : 0); > > no functional change, but much easier to understand. > > Except for that the whole series looks good: Sounds good, thanks for the reviews, Christoph and Ming. Updated with your suggestion and applied (Jens picked up the blk-mq part; nvme-4.17 is rebased to that).