Skip to contentSkip to conversation

ndctl: Fixes for building without keyutils

PATCH In review Oliver O'Halloran 2 participants 2 messages Feb 5, 2019 libnvdimm: non-volatile memory device

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ndctl: Fixes for building without keyutils

Fixes for some build errors when ndctl is configured without keyutils support.

---
Ran into this when making a test buildroot image. This is probably not going to be an issue if you're compiling on a real OS.

---
 ndctl/ndctl.c     | 2 ++
 ndctl/util/keys.h | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
ndctl/ndctl.c +2 -0
index b5c3bf884d65..bd333b292743 100644
@@ -93,7 +93,9 @@ static struct cmd_struct commands[] = {
 	{ "remove-passphrase", { cmd_remove_passphrase } },
 	{ "freeze-security", { cmd_freeze_security } },
 	{ "sanitize-dimm", { cmd_sanitize_dimm } },
+#ifdef ENABLE_KEYUTILS
 	{ "load-keys", { cmd_load_keys } },
+#endif
 	{ "wait-overwrite", { cmd_wait_overwrite } },
 	{ "list", { cmd_list } },
 	{ "monitor", { cmd_monitor } },
ndctl/util/keys.h +1 -1
index c4d57eae1afc..30687a136512 100644
@@ -46,7 +46,7 @@ static inline int ndctl_dimm_remove_key(struct ndctl_dimm *dimm)
 }
 
 static inline int ndctl_dimm_secure_erase_key(struct ndctl_dimm *dimm,
-		enum ndctl_key_type key_type);
+		enum ndctl_key_type key_type)
 {
 	return -EOPNOTSUPP;
 }
Signature · 6 lines
2.20.1

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm
maintainer
#1 lore raw
Quoted 4 lines · Oliver O'Halloran

Fixes for some build errors when ndctl is configured without keyutils support.

Quoted 8 lines

---
Ran into this when making a test buildroot image. This is probably not going to be an issue if you're compiling on a real OS.

---
 ndctl/ndctl.c     | 2 ++
 ndctl/util/keys.h | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

Thanks Oliver, applied.

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm