netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] netfilter: don't output error message redundantly
@ 2014-07-23  6:19 Duan Jiong
  2014-07-24 11:49 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 6+ messages in thread
From: Duan Jiong @ 2014-07-23  6:19 UTC (permalink / raw)
  To: Pablo Neira Ayuso; +Cc: netfilter-devel


The function led_trigger_register() will only return -EEXIST when
error arises.

Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
---
 net/netfilter/xt_LED.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_LED.c
index 993de2b..b47a58c 100644
--- a/net/netfilter/xt_LED.c
+++ b/net/netfilter/xt_LED.c
@@ -133,9 +133,7 @@ static int led_tg_check(const struct xt_tgchk_param *par)
 
 	err = led_trigger_register(&ledinternal->netfilter_led_trigger);
 	if (err) {
-		pr_warning("led_trigger_register() failed\n");
-		if (err == -EEXIST)
-			pr_warning("Trigger name is already in use.\n");
+		pr_warning("Trigger name is already in use.\n");
 		goto exit_alloc;
 	}
 
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] netfilter: don't output error message redundantly
  2014-07-23  6:19 [PATCH] netfilter: don't output error message redundantly Duan Jiong
@ 2014-07-24 11:49 ` Pablo Neira Ayuso
  2014-07-25  1:06   ` [PATCH v2] " Duan Jiong
  2015-03-06 21:27   ` [PATCH] " Patrick McHardy
  0 siblings, 2 replies; 6+ messages in thread
From: Pablo Neira Ayuso @ 2014-07-24 11:49 UTC (permalink / raw)
  To: Duan Jiong; +Cc: netfilter-devel

On Wed, Jul 23, 2014 at 02:19:09PM +0800, Duan Jiong wrote:
> 
> The function led_trigger_register() will only return -EEXIST when
> error arises.
> 
> Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
> ---
>  net/netfilter/xt_LED.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_LED.c
> index 993de2b..b47a58c 100644
> --- a/net/netfilter/xt_LED.c
> +++ b/net/netfilter/xt_LED.c
> @@ -133,9 +133,7 @@ static int led_tg_check(const struct xt_tgchk_param *par)
>  
>  	err = led_trigger_register(&ledinternal->netfilter_led_trigger);
>  	if (err) {
> -		pr_warning("led_trigger_register() failed\n");
> -		if (err == -EEXIST)
> -			pr_warning("Trigger name is already in use.\n");
> +		pr_warning("Trigger name is already in use.\n");

This should be pr_err() since the rule fails to be loaded if
led_trigger_register() fails.


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v2] netfilter: don't output error message redundantly
  2014-07-24 11:49 ` Pablo Neira Ayuso
@ 2014-07-25  1:06   ` Duan Jiong
  2014-07-25 13:00     ` Pablo Neira Ayuso
  2015-03-06 21:27   ` [PATCH] " Patrick McHardy
  1 sibling, 1 reply; 6+ messages in thread
From: Duan Jiong @ 2014-07-25  1:06 UTC (permalink / raw)
  To: Pablo Neira Ayuso; +Cc: netfilter-devel


The function led_trigger_register() will only return -EEXIST when
error arises.

Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
---

v2: use pr_err rather than pr_warning

 net/netfilter/xt_LED.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_LED.c
index 993de2b..f14bcf2 100644
--- a/net/netfilter/xt_LED.c
+++ b/net/netfilter/xt_LED.c
@@ -133,9 +133,7 @@ static int led_tg_check(const struct xt_tgchk_param *par)
 
 	err = led_trigger_register(&ledinternal->netfilter_led_trigger);
 	if (err) {
-		pr_warning("led_trigger_register() failed\n");
-		if (err == -EEXIST)
-			pr_warning("Trigger name is already in use.\n");
+		pr_err("Trigger name is already in use.\n");
 		goto exit_alloc;
 	}
 
-- 
1.8.3.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] netfilter: don't output error message redundantly
  2014-07-25  1:06   ` [PATCH v2] " Duan Jiong
@ 2014-07-25 13:00     ` Pablo Neira Ayuso
  0 siblings, 0 replies; 6+ messages in thread
From: Pablo Neira Ayuso @ 2014-07-25 13:00 UTC (permalink / raw)
  To: Duan Jiong; +Cc: netfilter-devel

On Fri, Jul 25, 2014 at 09:06:27AM +0800, Duan Jiong wrote:
> 
> The function led_trigger_register() will only return -EEXIST when
> error arises.

Applied, thanks.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] netfilter: don't output error message redundantly
  2014-07-24 11:49 ` Pablo Neira Ayuso
  2014-07-25  1:06   ` [PATCH v2] " Duan Jiong
@ 2015-03-06 21:27   ` Patrick McHardy
  2015-03-06 21:29     ` Patrick McHardy
  1 sibling, 1 reply; 6+ messages in thread
From: Patrick McHardy @ 2015-03-06 21:27 UTC (permalink / raw)
  To: Pablo Neira Ayuso, Duan Jiong; +Cc: netfilter-devel

Am 24. Juli 2014 13:49:46 MESZ, schrieb Pablo Neira Ayuso <pablo@netfilter.org>:
>On Wed, Jul 23, 2014 at 02:19:09PM +0800, Duan Jiong wrote:
>> 
>> The function led_trigger_register() will only return -EEXIST when
>> error arises.
>> 
>> Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
>> ---
>>  net/netfilter/xt_LED.c | 4 +---
>>  1 file changed, 1 insertion(+), 3 deletions(-)
>> 
>> diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_LED.c
>> index 993de2b..b47a58c 100644
>> --- a/net/netfilter/xt_LED.c
>> +++ b/net/netfilter/xt_LED.c
>> @@ -133,9 +133,7 @@ static int led_tg_check(const struct
>xt_tgchk_param *par)
>>  
>>  	err = led_trigger_register(&ledinternal->netfilter_led_trigger);
>>  	if (err) {
>> -		pr_warning("led_trigger_register() failed\n");
>> -		if (err == -EEXIST)
>> -			pr_warning("Trigger name is already in use.\n");
>> +		pr_warning("Trigger name is already in use.\n");
>
>This should be pr_err() since the rule fails to be loaded if
>led_trigger_register() fails.

I disagree with this patch, any error and EEXIST are two different things.

>
>--
>To unsubscribe from this list: send the line "unsubscribe
>netfilter-devel" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] netfilter: don't output error message redundantly
  2015-03-06 21:27   ` [PATCH] " Patrick McHardy
@ 2015-03-06 21:29     ` Patrick McHardy
  0 siblings, 0 replies; 6+ messages in thread
From: Patrick McHardy @ 2015-03-06 21:29 UTC (permalink / raw)
  To: Pablo Neira Ayuso, Duan Jiong; +Cc: netfilter-devel

Am 6. März 2015 22:27:09 MEZ, schrieb Patrick McHardy <kaber@trash.net>:
>Am 24. Juli 2014 13:49:46 MESZ, schrieb Pablo Neira Ayuso
><pablo@netfilter.org>:
>>On Wed, Jul 23, 2014 at 02:19:09PM +0800, Duan Jiong wrote:
>>> 
>>> The function led_trigger_register() will only return -EEXIST when
>>> error arises.
>>> 
>>> Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
>>> ---
>>>  net/netfilter/xt_LED.c | 4 +---
>>>  1 file changed, 1 insertion(+), 3 deletions(-)
>>> 
>>> diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_LED.c
>>> index 993de2b..b47a58c 100644
>>> --- a/net/netfilter/xt_LED.c
>>> +++ b/net/netfilter/xt_LED.c
>>> @@ -133,9 +133,7 @@ static int led_tg_check(const struct
>>xt_tgchk_param *par)
>>>  
>>>  	err = led_trigger_register(&ledinternal->netfilter_led_trigger);
>>>  	if (err) {
>>> -		pr_warning("led_trigger_register() failed\n");
>>> -		if (err == -EEXIST)
>>> -			pr_warning("Trigger name is already in use.\n");
>>> +		pr_warning("Trigger name is already in use.\n");
>>
>>This should be pr_err() since the rule fails to be loaded if
>>led_trigger_register() fails.
>
>I disagree with this patch, any error and EEXIST are two different
>things.

Sorry didn't notice mails on my tablet were 9 months out oft sync :)

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-03-06 21:30 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-23  6:19 [PATCH] netfilter: don't output error message redundantly Duan Jiong
2014-07-24 11:49 ` Pablo Neira Ayuso
2014-07-25  1:06   ` [PATCH v2] " Duan Jiong
2014-07-25 13:00     ` Pablo Neira Ayuso
2015-03-06 21:27   ` [PATCH] " Patrick McHardy
2015-03-06 21:29     ` Patrick McHardy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).