diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-02 16:27:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-02 16:27:15 -0800 |
| commit | 97ee9d1c16963375eefdf964c429897d27e28956 (patch) | |
| tree | b55765e771adcc04e3d3e7ff2ad1adfbd08eaccd /drivers/nvme/host/pci.c | |
| parent | 63050a5ca130e76af7199c9a3fba1d175f3a1102 (diff) | |
| parent | d0f411c0b9bdef85f647e15a2fcc790b29891f2c (diff) | |
| download | linux-97ee9d1c16963375eefdf964c429897d27e28956.tar.gz | |
Merge tag 'block-6.1-2022-12-02' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
"Just a small NVMe merge for this week, fixing protection of the name
space list, and a missing clear of a reserved field when unused"
* tag 'block-6.1-2022-12-02' of git://git.kernel.dk/linux:
nvme: fix SRCU protection of nvme_ns_head list
nvme-pci: clear the prp2 field when not used
Diffstat (limited to 'drivers/nvme/host/pci.c')
| -rw-r--r-- | drivers/nvme/host/pci.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index f4335519399d..488ad7dabeb8 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -797,6 +797,8 @@ static blk_status_t nvme_setup_prp_simple(struct nvme_dev *dev, cmnd->dptr.prp1 = cpu_to_le64(iod->first_dma); if (bv->bv_len > first_prp_len) cmnd->dptr.prp2 = cpu_to_le64(iod->first_dma + first_prp_len); + else + cmnd->dptr.prp2 = 0; return BLK_STS_OK; } |