]> git.ipfire.org Git - thirdparty/linux.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, 20 May 2025 03:34:25 +0000 (05:34 +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 aba365f97cf6b42ba3c93e666708c8c315d121f2..c5dae87bc1c9a46b82eb113d97e6612d17ed72d1 100644 (file)
@@ -2385,7 +2385,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);