nvmet-tcp: remove superflous check on request sgl

[linux.git] / drivers / nvme / target / tcp.c

diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c
index 69b83fa0c76c173ed040d4ea9a0e9db3551582d0..d535080b781f95b0d66b97cad3e822d2782fd772 100644 (file)
--- a/drivers/nvme/target/tcp.c
+++ b/drivers/nvme/target/tcp.c
@@ -1306,6 +1306,7 @@ static void nvmet_tcp_finish_cmd(struct nvmet_tcp_cmd *cmd)
 {
        nvmet_req_uninit(&cmd->req);
        nvmet_tcp_unmap_pdu_iovec(cmd);
+       kfree(cmd->iov);
        sgl_free(cmd->req.sg);
 }
 
@@ -1410,6 +1411,7 @@ static void nvmet_tcp_state_change(struct sock *sk)
 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;
 
@@ -1433,6 +1435,16 @@ static int nvmet_tcp_set_queue_sock(struct nvmet_tcp_queue *queue)
        if (ret)
                return ret;
 
+       /* Set socket type of service */
+       if (inet->rcv_tos > 0) {
+               int tos = inet->rcv_tos;
+
+               ret = kernel_setsockopt(sock, SOL_IP, IP_TOS,
+                               (char *)&tos, sizeof(tos));
+               if (ret)
+                       return ret;
+       }
+
        write_lock_bh(&sock->sk->sk_callback_lock);
        sock->sk->sk_user_data = queue;
        queue->data_ready = sock->sk->sk_data_ready;