Commit 6affe08a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Keith Busch
Browse files

nvme: common: make keyring and auth separate modules 



When only the keyring module is included but auth is not, modpost
complains about the lack of a module license tag:

ERROR: modpost: missing MODULE_LICENSE() in drivers/nvme/common/nvme-common.o

Address this by making both modules buildable standalone,
removing the now unnecessary CONFIG_NVME_COMMON symbol
in the process.

Also, now that NVME_KEYRING config symbol can be either a module or
built-in, the stubs need to check for '#if IS_ENABLED' rather than a
simple '#ifdef'.

Fixes: 9d77eb52 ("nvme-keyring: register '.nvme' keyring")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 4733b65d

drivers/nvme/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



obj-$(CONFIG_NVME_COMMON)		+= common/

obj-y		+= common/

obj-y		+= host/

obj-y		+= target/

drivers/nvme/common/Kconfig

+2 −5
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only



config NVME_COMMON

       tristate



config NVME_KEYRING

       bool

       tristate

       select KEYS



config NVME_AUTH

	bool

	tristate

	select CRYPTO

	select CRYPTO_HMAC

	select CRYPTO_SHA256

drivers/nvme/common/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 


ccflags-y			+= -I$(src)



obj-$(CONFIG_NVME_COMMON)	+= nvme-common.o

obj-$(CONFIG_NVME_AUTH)		+= nvme-auth.o

obj-$(CONFIG_NVME_KEYRING)	+= nvme-keyring.o



nvme-common-$(CONFIG_NVME_AUTH)	+= auth.o

nvme-common-$(CONFIG_NVME_KEYRING) += keyring.o
 
nvme-auth-y			+= auth.o

nvme-keyring-y			+= keyring.o

drivers/nvme/common/keyring.c

+2 −0
Original line number Diff line number Diff line
@@ -180,3 +180,5 @@ void nvme_keyring_exit(void) 
	key_put(nvme_keyring);

}

EXPORT_SYMBOL_GPL(nvme_keyring_exit);



MODULE_LICENSE("GPL v2");

drivers/nvme/host/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ config NVME_TCP 
config NVME_TCP_TLS

	bool "NVMe over Fabrics TCP TLS encryption support"

	depends on NVME_TCP

	select NVME_COMMON

	select NVME_KEYRING

	select NET_HANDSHAKE

	select KEYS
@@ -110,7 +109,6 @@ config NVME_TCP_TLS 
config NVME_HOST_AUTH

	bool "NVM Express over Fabrics In-Band Authentication"

	depends on NVME_CORE

	select NVME_COMMON

	select NVME_AUTH

	help

	  This provides support for NVMe over Fabrics In-Band Authentication.