diff options
| author |   Christoph Hellwig <hch@lst.de> | 2020-05-28 07:12:10 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-05-28 11:11:44 -0700 |
| commit | c433594c07457d2b2e41a87014bfad9bec279abf (patch) | |
| tree | 2c878b9ba357b4a52aec683daa19a1c3cf759cec /drivers/nvme/target/tcp.c | |
| parent | net: add sock_set_reuseaddr (diff) | |
| download | linux-dev-c433594c07457d2b2e41a87014bfad9bec279abf.tar.xz linux-dev-c433594c07457d2b2e41a87014bfad9bec279abf.zip | |
net: add sock_no_linger
Add a helper to directly set the SO_LINGER sockopt from kernel space
with onoff set to true and a linger time of 0 without going through a
fake uaccess.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/nvme/target/tcp.c')
| -rw-r--r-- | drivers/nvme/target/tcp.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index 40757a63f455..e0801494b097 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@ -1429,7 +1429,6 @@ static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) { struct socket *sock = queue->sock; struct inet_sock *inet = inet_sk(sock->sk); - struct linger sol = { .l_onoff = 1, .l_linger = 0 }; int ret; ret = kernel_getsockname(sock, @@ -1447,10 +1446,7 @@ static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue) * close. This is done to prevent stale data from being sent should * the network connection be restored before TCP times out. */ - ret = kernel_setsockopt(sock, SOL_SOCKET, SO_LINGER, - (char *)&sol, sizeof(sol)); - if (ret) - return ret; + sock_no_linger(sock->sk); if (so_priority > 0) { ret = kernel_setsockopt(sock, SOL_SOCKET, SO_PRIORITY, |