From: cp0613@linux.alibaba.com
To: alison.schofield@intel.com, nvdimm@lists.linux.dev
Cc: linux-cxl@vger.kernel.org, Chen Pei <cp0613@linux.alibaba.com>
Subject: [ndctl PATCH v2] ndctl: Fix missing key_type parameter in ndctl_dimm_remove_key stub
Date: Thu, 19 Mar 2026 09:51:49 +0800 [thread overview]
Message-ID: <20260319015149.13719-1-cp0613@linux.alibaba.com> (raw)
From: Chen Pei <cp0613@linux.alibaba.com>
When keyutils is disabled, the following compilation error occurs:
../ndctl/dimm.c: In function ‘action_remove_passphrase’:
../ndctl/dimm.c:1030:16: error: too many arguments to function ‘ndctl_dimm_remove_key’
1030 | return ndctl_dimm_remove_key(dimm, param.master_pass ? ND_MASTER_KEY :
| ^~~~~~~~~~~~~~~~~~~~~
In file included from ../ndctl/dimm.c:25:
../ndctl/keys.h:51:19: note: declared here
51 | static inline int ndctl_dimm_remove_key(struct ndctl_dimm *dimm)
| ^~~~~~~~~~~~~~~~~~~~~
This patch fixes the issue by adding the missing key_type parameter to
the stub declaration of ndctl_dimm_remove_key in keys.h, ensuring the
function signature matches its usage.
Fixes: a79375a9b0cd ("ndctl: Add master-passphrase removal support")
Signed-off-by: Chen Pei <cp0613@linux.alibaba.com>
---
ndctl/keys.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ndctl/keys.h b/ndctl/keys.h
index ce71ff2..b60c209 100644
--- a/ndctl/keys.h
+++ b/ndctl/keys.h
@@ -48,7 +48,8 @@ static inline int ndctl_dimm_update_key(struct ndctl_dimm *dimm,
return -EOPNOTSUPP;
}
-static inline int ndctl_dimm_remove_key(struct ndctl_dimm *dimm)
+static inline int ndctl_dimm_remove_key(struct ndctl_dimm *dimm,
+ enum ndctl_key_type key_type)
{
return -EOPNOTSUPP;
}
--
2.43.0
next reply other threads:[~2026-03-19 1:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-19 1:51 cp0613 [this message]
2026-03-20 2:21 ` [ndctl PATCH v2] ndctl: Fix missing key_type parameter in ndctl_dimm_remove_key stub Alison Schofield
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260319015149.13719-1-cp0613@linux.alibaba.com \
--to=cp0613@linux.alibaba.com \
--cc=alison.schofield@intel.com \
--cc=linux-cxl@vger.kernel.org \
--cc=nvdimm@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox