diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2021-07-07 06:37:36 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-07-07 06:37:36 -0600 |
| commit | c6af8db92b9a9bc89e3d25535fdc26cb61f419d0 (patch) | |
| tree | 4bedd822909aa74d9f533f0dcb59aa428357afce | |
| parent | loop: remove unused variable in loop_set_status() (diff) | |
| parent | nvme-tcp: can't set sk_user_data without write_lock (diff) | |
| download | linux-dev-c6af8db92b9a9bc89e3d25535fdc26cb61f419d0.tar.xz linux-dev-c6af8db92b9a9bc89e3d25535fdc26cb61f419d0.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | drivers/nvme/target/tcp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index d8aceef83284..07ee347ea3f3 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -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: |