diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-05-29 12:54:12 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-05-29 12:54:12 -0600 |
| commit | 43b4d1e122914c87e26bd83f6c0a1c50ddf31178 (patch) | |
| tree | f9a69cb11a0ae47fd8afa16e9e793bf9b54b45fd | |
| parent | eedffa28c9b00ca2dcb4d541b5a530f4c917052d (diff) | |
| parent | c97f414c54a255f4f05a50a2625efaeee406e134 (diff) | |
| download | nfc-next-43b4d1e122914c87e26bd83f6c0a1c50ddf31178.tar.gz | |
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
| -rw-r--r-- | drivers/nvme/host/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 99b857e5a7a9c..b9ca782fe82dd 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -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; |