[PATCH v4 1/4] nvme: move ns id info to struct nvme_ns_head

[Daniel Wagner]

On Thu, Dec 07, 2023 at 09:31:16AM -0700, Keith Busch wrote:
> On Thu, Dec 07, 2023 at 01:36:21PM +0100, Daniel Wagner wrote:
> > @@ -1906,7 +1908,8 @@ static void nvme_update_disk_info(struct gendisk *disk,
> >  	 * or smaller than a sector size yet, so catch this early and don't
> >  	 * allow block I/O.
> >  	 */
> > -	if (ns->lba_shift > PAGE_SHIFT || ns->lba_shift < SECTOR_SHIFT) {
> > +	if (ns->head->lba_shift > PAGE_SHIFT ||
> > +	    ns->head->lba_shift < SECTOR_SHIFT) {
> >  		capacity = 0;
> >  		bs = (1 << 9);
> >  	}
> 
> A minor conflict here: this series would target nvme-6.8, but the block
> tree we're based on doesn't have this code. I'll patch it up for the
> current 6.8 tree and make a note of the conflict for the next merge
> window.

I've missed that nvme-6.8 was available now. I can rebase v5 ontop of
nvme-6.8 if you want me to do it. Whatever is simpler for you.