On 2020-05-13 18:54, Damien Le Moal wrote: > @@ -1848,7 +1847,8 @@ static void nvme_update_disk_info(struct gendisk *disk, > */ > blk_queue_physical_block_size(disk->queue, min(phys_bs, atomic_bs)); > blk_queue_io_min(disk->queue, phys_bs); > - blk_queue_io_opt(disk->queue, io_opt); > + if (io_opt) > + blk_queue_io_opt(disk->queue, io_opt); The above change looks confusing to me. We want the NVMe driver to set io_opt, so why only call blk_queue_io_opt() if io_opt != 0? That means that the io_opt value will be left to any value set by the block layer core if io_opt == 0 instead of properly being set to zero. Thanks, Bart.