diff options
| author | Jens Axboe <axboe@kernel.dk> | 2021-05-27 07:38:12 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-05-27 07:38:12 -0600 |
| commit | a4b58f1721eb4d7d27e0fdcaba60d204248dcd25 (patch) | |
| tree | 29abacf04e627e2cec9c962630bc93a708c836be /drivers/nvme/target/nvmet.h | |
| parent | 094c271addc3e149e09474934c49a6b98f2d087f (diff) | |
| parent | aaeadd7075dc9e184bc7876e9dd7b3bada771df2 (diff) | |
Merge tag 'nvme-5.13-2021-05-27' of git://git.infradead.org/nvme into block-5.13block-5.13-2021-05-28
Pull NVMe fixes from Christoph:
"nvme fixes for Linux 5.13
- fix a memory leak in nvme_cdev_add (Guoqing Jiang)
- fix inline data size comparison in nvmet_tcp_queue_response (Hou Pu)
- fix false keep-alive timeout when a controller is torn down
(Sagi Grimberg)
- fix a nvme-tcp Kconfig dependency (Sagi Grimberg)
- short-circuit reconnect retries for FC (Hannes Reinecke)
- decode host pathing error for connect (Hannes Reinecke)"
* tag 'nvme-5.13-2021-05-27' of git://git.infradead.org/nvme:
nvmet: fix false keep-alive timeout when a controller is torn down
nvmet-tcp: fix inline data size comparison in nvmet_tcp_queue_response
nvme-tcp: remove incorrect Kconfig dep in BLK_DEV_NVME
nvme-fabrics: decode host pathing error for connect
nvme-fc: short-circuit reconnect retries
nvme: fix potential memory leaks in nvme_cdev_add
Diffstat (limited to 'drivers/nvme/target/nvmet.h')
| -rw-r--r-- | drivers/nvme/target/nvmet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h index d69a409515d6..53aea9a8056e 100644 --- a/drivers/nvme/target/nvmet.h +++ b/drivers/nvme/target/nvmet.h @@ -167,7 +167,7 @@ struct nvmet_ctrl { struct nvmet_subsys *subsys; struct nvmet_sq **sqs; - bool cmd_seen; + bool reset_tbkas; struct mutex lock; u64 cap; |