]> www.infradead.org Git - nvme.git/commitdiff
nvme-tcp: remove redundant check to ctrl->opts
authorHannes Reinecke <hare@kernel.org>
Tue, 15 Apr 2025 06:00:21 +0000 (08:00 +0200)
committerChristoph Hellwig <hch@lst.de>
Tue, 22 Apr 2025 08:02:48 +0000 (10:02 +0200)
When checking for secure concatenation we have already validated
that 'ctrl->opts' is set, so we can remove this check.

Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Hannes Reinecke <hare@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/tcp.c

index 72d260201d8cfef23f55d29a562cc23e2cd3e3e0..e20a994d63c24b80a2ca0eb796d60f2adeb32004 100644 (file)
@@ -2358,7 +2358,7 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctrl, bool new)
        if (ret)
                return ret;
 
-       if (ctrl->opts && ctrl->opts->concat && !ctrl->tls_pskid) {
+       if (ctrl->opts->concat && !ctrl->tls_pskid) {
                /* See comments for nvme_tcp_key_revoke_needed() */
                dev_dbg(ctrl->device, "restart admin queue for secure concatenation\n");
                nvme_stop_keep_alive(ctrl);