[PATCH 1/5] nvme: also set BLK_MQ_F_SHOULD_MERGE for the admin queue

[Christoph Hellwig]

On Wed, Mar 02, 2016 at 07:35:56PM +0200, Sagi Grimberg wrote:
>> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
>> index 680f578..19be56a 100644
>> --- a/drivers/nvme/host/pci.c
>> +++ b/drivers/nvme/host/pci.c
>> @@ -1289,6 +1289,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev)
>>   		dev->admin_tagset.timeout = ADMIN_TIMEOUT;
>>   		dev->admin_tagset.numa_node = dev_to_node(dev->dev);
>>   		dev->admin_tagset.cmd_size = nvme_cmd_size(dev);
>> +		dev->admin_tagset.flags = BLK_MQ_F_SHOULD_MERGE;
>
> I still don't understand what's the point?

still? :)

But yes, we're not going to hit the merge case for the passthrough
command indeed.  Except for keeping the flags in sync, which sounds
like a good іdea in general there is not reall need for this one.