netfilter: don't output error message redundantly
Subsystems (2)
PATCH 1/1 netfilter: don't output error message redundantly
The function led_trigger_register() will only return -EEXIST when error arises.
--- net/netfilter/xt_LED.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/netfilter/xt_LED.c +1 -3
@@ -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; }
Signature · 1 line
1.8.3.1
Pablo Neira Ayuso
maintainerQuoted 14 lines · Duan Jiong
The function
led_trigger_register()will only return-EEXISTwhen error arises.Signed-off-by Duan Jiong <[email protected]>--- net/netfilter/xt_LED.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)net/netfilter/xt_LED.c +0
-0
net/netfilter/xt_LED.c static int led_tg_check(const struct xt_tgchk_param *par) · line 136
Quoted 7 lines
net/netfilter/xt_LED.c +1
-3@@ -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.
PATCH v2 1/1 netfilter: don't output error message redundantly
The function led_trigger_register() will only return -EEXIST when error arises.
---
v2: use pr_err rather than pr_warning
net/netfilter/xt_LED.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
net/netfilter/xt_LED.c +1 -3
@@ -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; }
Signature · 1 line
1.8.3.1
Quoted 3 lines · Duan Jiong
The function
led_trigger_register()will only return-EEXISTwhen error arises.
Applied, thanks.
Am 24. Juli 2014 13:49:46 MESZ, schrieb Pablo Neira Ayuso <[email protected]>:
Quoted 17 lines · Duan Jiong
net/netfilter/xt_LED.c static int led_tg_check(const struct
Quoted 14 lines
The function
led_trigger_register()will only return-EEXISTwhen error arises.Signed-off-by Duan Jiong <[email protected]>--- net/netfilter/xt_LED.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)net/netfilter/xt_LED.c +0
-0@@ -133,9 +133,7 @@ static int led_tg_check(const struct
xt_tgchk_param*par)Quoted 1 line
Quoted 9 lines
net/netfilter/xt_LED.c static int led_tg_check(const struct xt_tgchk_param *par) · line 136
Quoted 6 lines
net/netfilter/xt_LED.c +1
-3err =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 ifled_trigger_register()fails.
I disagree with this patch, any error and EEXIST are two different things.
Quoted 6 lines
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Am 6. März 2015 22:27:09 MEZ, schrieb Patrick McHardy <[email protected]>:
Quoted 29 lines
Am 24. Juli 2014 13:49:46 MESZ, schrieb Pablo Neira Ayuso <[email protected]>:
Quoted 17 lines · Duan Jiong
net/netfilter/xt_LED.c static int led_tg_check(const struct
Quoted 14 lines
The function
led_trigger_register()will only return-EEXISTwhen error arises.Signed-off-by Duan Jiong <[email protected]>--- net/netfilter/xt_LED.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)net/netfilter/xt_LED.c +0
-0@@ -133,9 +133,7 @@ static int led_tg_check(const struct
xt_tgchk_param*par)Quoted 1 line
Quoted 9 lines
net/netfilter/xt_LED.c static int led_tg_check(const struct xt_tgchk_param *par) · line 136
Quoted 6 lines
net/netfilter/xt_LED.c +1
-3err =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 ifled_trigger_register()fails.
Quoted 2 lines
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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html