Skip to content

Commit

Permalink
Merge branch 'nvme-5.14' of git://git.infradead.org/nvme into block-5.14
Browse files Browse the repository at this point in the history
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
  • Loading branch information
axboe committed Jul 7, 2021
2 parents 585af8e + 0755d3b commit c6af8db
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/nvme/target/tcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit c6af8db

Please sign in to comment.