2004-01-28 13:05:44

by Willy Tarreau

Subject: [PATCH-2.4] add missing '\n' in bonding messages

Hi,

there are a few places where the bonding driver displays informational
messages without the trailing '\n', which is sometimes annoying because
messages get logged at the wrong level.

Here's the patch against 2.4.25-pre7. I haven't checked 2.6 nor the bonding
cleanup patch against those typos.

Regards,
Willy

diff -urN linux-2.4.25-pre7/drivers/net/bonding/bond_main.c linux-2.4.25-pre7-bondfix/drivers/net/bonding/bond_main.c
--- linux-2.4.25-pre7/drivers/net/bonding/bond_main.c Sat Nov 22 16:55:37 2003
+++ linux-2.4.25-pre7-bondfix/drivers/net/bonding/bond_main.c Wed Jan 28 13:58:22 2004
@@ -1712,7 +1712,7 @@
* all 0's.
*/
#ifdef BONDING_DEBUG
- printk(KERN_DEBUG "%s doesn't have a MAC address yet. ",
+ printk(KERN_DEBUG "%s doesn't have a MAC address yet.\n",
master_dev->name);
printk(KERN_DEBUG "Going to give assign it from %s.\n",
slave_dev->name);
@@ -2311,7 +2311,7 @@

printk(KERN_INFO
"%s: link status definitely down "
- "for interface %s, disabling it",
+ "for interface %s, disabling it.\n",
master->name,
dev->name);

@@ -2524,7 +2524,7 @@
if (oldcurrent == NULL) {
printk(KERN_INFO
"%s: link status definitely up "
- "for interface %s, ",
+ "for interface %s.\n",
master->name,
slave->dev->name);
do_failover = 1;
@@ -2733,7 +2733,7 @@
slave->link_failure_count++;
}
printk(KERN_INFO "%s: link status down for "
- "active interface %s, disabling it",
+ "active interface %s, disabling it.\n",
master->name,
slave->dev->name);
write_lock(&bond->ptrlock);
@@ -4101,7 +4101,7 @@
if (max_bonds < 1 || max_bonds > INT_MAX) {
printk(KERN_WARNING
"bonding_init(): max_bonds (%d) not in range %d-%d, "
- "so it was reset to BOND_DEFAULT_MAX_BONDS (%d)",
+ "so it was reset to BOND_DEFAULT_MAX_BONDS (%d)\n",
max_bonds, 1, INT_MAX, BOND_DEFAULT_MAX_BONDS);
max_bonds = BOND_DEFAULT_MAX_BONDS;
}

2004-01-28 13:23:21

by Shmuel Hen

Subject: Re: [PATCH-2.4] add missing '\n' in bonding messages

On Wednesday 28 January 2004 15:04, Willy Tarreau wrote:
>
> there are a few places where the bonding driver displays
> informational messages without the trailing '\n', which is
> sometimes annoying because messages get logged at the wrong level.
>
> Here's the patch against 2.4.25-pre7. I haven't checked 2.6 nor the
> bonding cleanup patch against those typos.
>

All those fixes are in the cleanup set and have been picked up by Jeff
for both netdev-2.4 and netdev-2.6 BK trees. To the best of my
understanding, they will be held until 2.4.25 and 2.6.2 are released.


--
| Shmulik Hen Advanced Network Services |
| Israel Design Center, Jerusalem |
| LAN Access Division, Platform Networking |
| Intel Communications Group, Intel corp. |