Merge branch 'nvme-5.14' of git://git.infradead.org/nvme into block-5.14

Pull single NVMe fix from Christoph.

* 'nvme-5.14' of git://git.infradead.org/nvme:
  nvme-tcp: can't set sk_user_data without write_lock
This commit is contained in:
Jens Axboe 2021-07-07 06:37:36 -06:00
commit c6af8db92b

View File

@ -1497,7 +1497,6 @@ static void nvmet_tcp_state_change(struct sock *sk)
case TCP_CLOSE_WAIT:
case TCP_CLOSE:
/* FALLTHRU */
sk->sk_user_data = NULL;
nvmet_tcp_schedule_release_queue(queue);
break;
default: