Patchwork [2/3] xfrm: add severity to printk

login
register
mail settings
Submitter stephen hemminger
Date May 12, 2010, 4:37 p.m.
Message ID <20100512163719.498741963@vyatta.com>
Download mbox | patch
Permalink /patch/52394/
State Accepted
Delegated to: David Miller
Headers show

Comments

stephen hemminger - May 12, 2010, 4:37 p.m.
Serious oh sh*t messages converted to WARN().
Add KERN_NOTICE severity to the unknown policy type messages.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>


---
 net/xfrm/xfrm_user.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)



--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - May 18, 2010, 5:58 a.m.
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 12 May 2010 09:37:06 -0700

> Serious oh sh*t messages converted to WARN().
> Add KERN_NOTICE severity to the unknown policy type messages.
> 
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

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

Patch

--- a/net/xfrm/xfrm_user.c	2010-05-11 21:08:58.618677963 -0700
+++ b/net/xfrm/xfrm_user.c	2010-05-11 21:12:36.339276557 -0700
@@ -1783,7 +1783,7 @@  static int xfrm_add_pol_expire(struct sk
 
 	} else {
 		// reset the timers here?
-		printk("Dont know what to do with soft policy expire\n");
+		WARN(1, "Dont know what to do with soft policy expire\n");
 	}
 	km_policy_expired(xp, p->dir, up->hard, current->pid);
 
@@ -1883,7 +1883,7 @@  static int xfrm_add_acquire(struct sk_bu
 	return 0;
 
 bad_policy:
-	printk("BAD policy passed\n");
+	WARN(1, "BAD policy passed\n");
 free_state:
 	kfree(x);
 nomem:
@@ -2385,8 +2385,9 @@  static int xfrm_send_state_notify(struct
 	case XFRM_MSG_FLUSHSA:
 		return xfrm_notify_sa_flush(c);
 	default:
-		 printk("xfrm_user: Unknown SA event %d\n", c->event);
-		 break;
+		printk(KERN_NOTICE "xfrm_user: Unknown SA event %d\n",
+		       c->event);
+		break;
 	}
 
 	return 0;
@@ -2676,7 +2677,8 @@  static int xfrm_send_policy_notify(struc
 	case XFRM_MSG_POLEXPIRE:
 		return xfrm_exp_policy_notify(xp, dir, c);
 	default:
-		printk("xfrm_user: Unknown Policy event %d\n", c->event);
+		printk(KERN_NOTICE "xfrm_user: Unknown Policy event %d\n",
+		       c->event);
 	}
 
 	return 0;