Re: [ndctl PATCH 1/2] ndctl: Fix missing key_type parameter in ndctl_dimm_remove_key stub

[Alison Schofield <alison.schofield@intel.com>]

On Tue, Mar 10, 2026 at 10:41:01AM +0800, cp0613@linux.alibaba.com wrote:
> From: Chen Pei <cp0613@linux.alibaba.com>
> 
> When fwctl is disabled, the following compilation error occurs:
> 

Thanks for the patch Chen Pei!

This failure does not appear to be tied to -Dfwctl=disabled.
The mismatch is gated by ENABLE_KEYUTILS in keys.h, so this
should be reproducible when keytuils support is disabled, 
not fwctl.

Please update the commit message to reflect the correct
configuration trigger.

Send a v2 of this patch alone, since I've already applied
the other patch in this series.

-- Alison


>   ../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
>