Commit d895ec79 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'block-6.0-2022-09-02' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:

 - NVMe pull request via Christoph:
     - error handling fix for the new auth code (Hannes Reinecke)
     - fix unhandled tcp states in nvmet_tcp_state_change (Maurizio
       Lombardi)
     - add NVME_QUIRK_BOGUS_NID for Lexar NM610 (Shyamin Ayesh)

 - Add documentation for the ublk driver merged in this merge window
   (Ming)

* tag 'block-6.0-2022-09-02' of git://git.kernel.dk/linux-block:
  Documentation: document ublk
  nvmet-tcp: fix unhandled tcp states in nvmet_tcp_state_change()
  nvmet-auth: add missing goto in nvmet_setup_auth()
  nvme-pci: add NVME_QUIRK_BOGUS_NID for Lexar NM610
parents cec53f4c 7a3d2225
...@@ -23,3 +23,4 @@ Block ...@@ -23,3 +23,4 @@ Block
stat stat
switching-sched switching-sched
writeback_cache_control writeback_cache_control
ublk
This diff is collapsed.
...@@ -20764,6 +20764,7 @@ UBLK USERSPACE BLOCK DRIVER ...@@ -20764,6 +20764,7 @@ UBLK USERSPACE BLOCK DRIVER
M: Ming Lei <ming.lei@redhat.com> M: Ming Lei <ming.lei@redhat.com>
L: linux-block@vger.kernel.org L: linux-block@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/block/ublk.rst
F: drivers/block/ublk_drv.c F: drivers/block/ublk_drv.c
F: include/uapi/linux/ublk_cmd.h F: include/uapi/linux/ublk_cmd.h
......
...@@ -3517,6 +3517,8 @@ static const struct pci_device_id nvme_id_table[] = { ...@@ -3517,6 +3517,8 @@ static const struct pci_device_id nvme_id_table[] = {
.driver_data = NVME_QUIRK_NO_DEEPEST_PS, }, .driver_data = NVME_QUIRK_NO_DEEPEST_PS, },
{ PCI_DEVICE(0xc0a9, 0x540a), /* Crucial P2 */ { PCI_DEVICE(0xc0a9, 0x540a), /* Crucial P2 */
.driver_data = NVME_QUIRK_BOGUS_NID, }, .driver_data = NVME_QUIRK_BOGUS_NID, },
{ PCI_DEVICE(0x1d97, 0x2263), /* Lexar NM610 */
.driver_data = NVME_QUIRK_BOGUS_NID, },
{ PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061), { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0061),
.driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, }, .driver_data = NVME_QUIRK_DMA_ADDRESS_BITS_48, },
{ PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065), { PCI_DEVICE(PCI_VENDOR_ID_AMAZON, 0x0065),
......
...@@ -196,6 +196,7 @@ int nvmet_setup_auth(struct nvmet_ctrl *ctrl) ...@@ -196,6 +196,7 @@ int nvmet_setup_auth(struct nvmet_ctrl *ctrl)
if (IS_ERR(ctrl->ctrl_key)) { if (IS_ERR(ctrl->ctrl_key)) {
ret = PTR_ERR(ctrl->ctrl_key); ret = PTR_ERR(ctrl->ctrl_key);
ctrl->ctrl_key = NULL; ctrl->ctrl_key = NULL;
goto out_free_hash;
} }
pr_debug("%s: using ctrl hash %s key %*ph\n", __func__, pr_debug("%s: using ctrl hash %s key %*ph\n", __func__,
ctrl->ctrl_key->hash > 0 ? ctrl->ctrl_key->hash > 0 ?
......
...@@ -1506,6 +1506,9 @@ static void nvmet_tcp_state_change(struct sock *sk) ...@@ -1506,6 +1506,9 @@ static void nvmet_tcp_state_change(struct sock *sk)
goto done; goto done;
switch (sk->sk_state) { switch (sk->sk_state) {
case TCP_FIN_WAIT2:
case TCP_LAST_ACK:
break;
case TCP_FIN_WAIT1: case TCP_FIN_WAIT1:
case TCP_CLOSE_WAIT: case TCP_CLOSE_WAIT:
case TCP_CLOSE: case TCP_CLOSE:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment