Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88a86765 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-20180530' of git://git.kernel.dk/linux-block 

Pull block fix from Jens Axboe:
 "Just a single fix that should make it into this release, fixing a
  regression with T10-DIF on NVMe"

* tag 'for-linus-20180530' of git://git.kernel.dk/linux-block:
  nvme: fix extended data LBA supported setting
parents 943cf9f3 43b4d1e1

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;