diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-11-22 23:47:17 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-11-22 18:40:14 -0700 |
| commit | d78abcbabe7e98bb4baa4dea87550806944790ed (patch) | |
| tree | 97b528e362cfd465fb882a491e81e380aaf633ef | |
| parent | 55072cd7ce36d6e3af949608bcb0e734d5a4b0c2 (diff) | |
| download | linux-d78abcbabe7e98bb4baa4dea87550806944790ed.tar.gz linux-d78abcbabe7e98bb4baa4dea87550806944790ed.tar.bz2 linux-d78abcbabe7e98bb4baa4dea87550806944790ed.zip | |
nvme: target: fix nvme_keyring_id() references
In configurations without CONFIG_NVME_TARGET_TCP_TLS, the keyring
code might not be available, or using it will result in a runtime
failure:
x86_64-linux-ld: vmlinux.o: in function `nvmet_ports_make':
configfs.c:(.text+0x100a211): undefined reference to `nvme_keyring_id'
Add a check to ensure we only check the keyring if there is a chance
of it being used, which avoids both the runtime and link-time
problems.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20231122224719.4042108-2-arnd@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | drivers/nvme/target/configfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c index 9eed6e6765ea..e307a044b1a1 100644 --- a/drivers/nvme/target/configfs.c +++ b/drivers/nvme/target/configfs.c @@ -1893,7 +1893,7 @@ static struct config_group *nvmet_ports_make(struct config_group *group, return ERR_PTR(-ENOMEM); } - if (nvme_keyring_id()) { + if (IS_ENABLED(CONFIG_NVME_TARGET_TCP_TLS) && nvme_keyring_id()) { port->keyring = key_lookup(nvme_keyring_id()); if (IS_ERR(port->keyring)) { pr_warn("NVMe keyring not available, disabling TLS\n"); |