diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-01 14:46:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-01 14:46:38 -0700 |
| commit | 1cc15701cd89b0ce695bbc5cff3a2bf3e2efd25f (patch) | |
| tree | 87202cdec2f83195e93ffe3c8e443ae405b7ccf8 /drivers/nvme/host/core.c | |
| parent | 4f2ba5dc183b71362c3655b50c72f1b10ccac1c1 (diff) | |
| parent | 79d73346ac05bc31f2e96f899c4e9aaaa616a8d4 (diff) | |
| download | linux-1cc15701cd89b0ce695bbc5cff3a2bf3e2efd25f.tar.gz linux-1cc15701cd89b0ce695bbc5cff3a2bf3e2efd25f.tar.bz2 linux-1cc15701cd89b0ce695bbc5cff3a2bf3e2efd25f.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"A few fixes that should go into this series:
- Regression fix for ide-cd, ensuring that a request is fully
initialized. From Hongxu.
- Ditto fix for virtio_blk, from Bart.
- NVMe fix from Keith, ensuring that we set the right block size on
revalidation. If the block size changed, we'd be in trouble without
it.
- NVMe rdma fix from Sagi, fixing a potential hang while the
controller is being removed"
* 'for-linus' of git://git.kernel.dk/linux-block:
ide:ide-cd: fix kernel panic resulting from missing scsi_req_init
nvme: Fix setting logical block format when revalidating
virtio_blk: Fix an SG_IO regression
nvme-rdma: fix possible hang when issuing commands during ctrl removal
Diffstat (limited to 'drivers/nvme/host/core.c')
| -rw-r--r-- | drivers/nvme/host/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 5a14cc7f28ee..37f9039bb9ca 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1249,6 +1249,7 @@ static int nvme_revalidate_disk(struct gendisk *disk) goto out; } + __nvme_revalidate_disk(disk, id); nvme_report_ns_ids(ctrl, ns->ns_id, id, eui64, nguid, &uuid); if (!uuid_equal(&ns->uuid, &uuid) || memcmp(&ns->nguid, &nguid, sizeof(ns->nguid)) || |