[Xenomai] [PATCH] Revert "cobalt/posix: Evaluate return code of signal_copyinfo extensions"

[Xenomai] [PATCH] Revert "cobalt/posix: Evaluate return code of signal_copyinfo extensions"

[Jan Kiszka]

This reverts commit e2520f8143c816b90d1531e36a405879fb640459.

The change was simply wrong, the return code was already passed, but
that is hidden in the parameter list of cobalt_call_extension. The
latter return 1 if a callback was invoked.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kernel/cobalt/posix/signal.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/kernel/cobalt/posix/signal.c b/kernel/cobalt/posix/signal.c
index 8e4d920b2d..cea67cd435 100644
--- a/kernel/cobalt/posix/signal.c
+++ b/kernel/cobalt/posix/signal.c
@@ -349,18 +349,17 @@ done:
 		ret = sys32_put_siginfo(u_si, sip, overrun);
 		if (!ret)
 			/* Allow an extended target to receive more data. */
-			ret = cobalt_call_extension(signal_copyinfo_compat,
-						    &curr->extref, ret, u_si,
-						    sip, overrun);
+			cobalt_call_extension(signal_copyinfo_compat,
+					      &curr->extref, ret, u_si, sip,
+					      overrun);
 	} else
 #endif
 	{
 		ret = signal_put_siginfo(u_si, sip, overrun);
 		if (!ret)
 			/* Allow an extended target to receive more data. */
-			ret = cobalt_call_extension(signal_copyinfo,
-						    &curr->extref, ret, u_si,
-						    sip, overrun);
+			cobalt_call_extension(signal_copyinfo, &curr->extref,
+					      ret, u_si, sip, overrun);
 	}
 
 out:
-- 
2.16.4

Re: [Xenomai] [PATCH] Revert "cobalt/posix: Evaluate return code of signal_copyinfo extensions"

[Jan Kiszka]

On 2018-09-03 19:07, Jan Kiszka wrote:
> This reverts commit e2520f8143c816b90d1531e36a405879fb640459.
> 
> The change was simply wrong, the return code was already passed, but
> that is hidden in the parameter list of cobalt_call_extension. The
> latter return 1 if a callback was invoked.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>   kernel/cobalt/posix/signal.c | 11 +++++------
>   1 file changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/kernel/cobalt/posix/signal.c b/kernel/cobalt/posix/signal.c
> index 8e4d920b2d..cea67cd435 100644
> --- a/kernel/cobalt/posix/signal.c
> +++ b/kernel/cobalt/posix/signal.c
> @@ -349,18 +349,17 @@ done:
>   		ret = sys32_put_siginfo(u_si, sip, overrun);
>   		if (!ret)
>   			/* Allow an extended target to receive more data. */
> -			ret = cobalt_call_extension(signal_copyinfo_compat,
> -						    &curr->extref, ret, u_si,
> -						    sip, overrun);
> +			cobalt_call_extension(signal_copyinfo_compat,
> +					      &curr->extref, ret, u_si, sip,
> +					      overrun);
>   	} else
>   #endif
>   	{
>   		ret = signal_put_siginfo(u_si, sip, overrun);
>   		if (!ret)
>   			/* Allow an extended target to receive more data. */
> -			ret = cobalt_call_extension(signal_copyinfo,
> -						    &curr->extref, ret, u_si,
> -						    sip, overrun);
> +			cobalt_call_extension(signal_copyinfo, &curr->extref,
> +					      ret, u_si, sip, overrun);
>   	}
>   
>   out:
> 

As this is a clear regression, I'm taking it to fast-path: in next now.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux