diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-01 22:33:45 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2019-08-01 22:33:45 -0400 |
| commit | 64552a8193c7ba9b7da0e0ee3f3b91c78a8a497e (patch) | |
| tree | 158b5d4ad6e7184c3843bfabfb1d960377cc011f | |
| parent | 3bcfc01d5cb09ca0da53de878002964cdc6c0745 (diff) | |
| download | longterm-queue-4.18-64552a8193c7ba9b7da0e0ee3f3b91c78a8a497e.tar.gz | |
nvme: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/nvme-set-0-capacity-if-namespace-block-size-exceeds-.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/queue/nvme-set-0-capacity-if-namespace-block-size-exceeds-.patch b/queue/nvme-set-0-capacity-if-namespace-block-size-exceeds-.patch index 2a403fd..a1531c9 100644 --- a/queue/nvme-set-0-capacity-if-namespace-block-size-exceeds-.patch +++ b/queue/nvme-set-0-capacity-if-namespace-block-size-exceeds-.patch @@ -1,4 +1,4 @@ -From 01fa017484ad98fccdeaab32db0077c574b6bd6f Mon Sep 17 00:00:00 2001 +From a823742631667af77db040d47773a99ea3cc1616 Mon Sep 17 00:00:00 2001 From: Sagi Grimberg <sagi@grimberg.me> Date: Mon, 11 Mar 2019 15:02:25 -0700 Subject: [PATCH] nvme: set 0 capacity if namespace block size exceeds @@ -16,11 +16,11 @@ Reviewed-by: Keith Busch <keith.busch@intel.com> Signed-off-by: Christoph Hellwig <hch@lst.de> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 248ff3b48041..3dd043aa6d1f 100644 +index 9ba161293046..0dae0fca9a23 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c -@@ -1591,6 +1591,10 @@ static void nvme_update_disk_info(struct gendisk *disk, - sector_t capacity = le64_to_cpu(id->nsze) << (ns->lba_shift - 9); +@@ -1468,6 +1468,10 @@ static void nvme_update_disk_info(struct gendisk *disk, + sector_t capacity = le64_to_cpup(&id->nsze) << (ns->lba_shift - 9); unsigned short bs = 1 << ns->lba_shift; + if (ns->lba_shift > PAGE_SHIFT) { @@ -30,7 +30,7 @@ index 248ff3b48041..3dd043aa6d1f 100644 blk_mq_freeze_queue(disk->queue); blk_integrity_unregister(disk); -@@ -1601,7 +1605,8 @@ static void nvme_update_disk_info(struct gendisk *disk, +@@ -1478,7 +1482,8 @@ static void nvme_update_disk_info(struct gendisk *disk, if (ns->ms && !ns->ext && (ns->ctrl->ops->flags & NVME_F_METADATA_SUPPORTED)) nvme_init_integrity(disk, ns->ms, ns->pi_type); |