Commit 43b4d1e1 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'nvme-4.17' of git://git.infradead.org/nvme into for-linus 

Pull NVMe fix from Christoph:

"Below is a one-liner fix from Max that unbreaks T10-DIF support, which
 got broken in 4.15."

* 'nvme-4.17' of git://git.infradead.org/nvme:
  nvme: fix extended data LBA supported setting
parents eedffa28 c97f414c

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1447,8 +1447,8 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id) 
	if (ns->lba_shift == 0)

		ns->lba_shift = 9;

	ns->noiob = le16_to_cpu(id->noiob);

	ns->ext = ns->ms && (id->flbas & NVME_NS_FLBAS_META_EXT);

	ns->ms = le16_to_cpu(id->lbaf[id->flbas & NVME_NS_FLBAS_LBA_MASK].ms);

	ns->ext = ns->ms && (id->flbas & NVME_NS_FLBAS_META_EXT);

	/* the PI implementation requires metadata equal t10 pi tuple size */

	if (ns->ms == sizeof(struct t10_pi_tuple))

		ns->pi_type = id->dps & NVME_NS_DPS_PI_MASK;