From linux-kernel@vger.kernel.org Thu Dec 18 21:30:47 2003 Date: Sat, 13 Dec 2003 13:20:08 +0000 From: Linux Kernel Mailing List To: bk-commits-24@vger.kernel.org Subject: [PATCH] IrDA kernel log buster ChangeSet 1.1277, 2003/12/13 11:20:08-02:00, jt@bougret.hpl.hp.com [PATCH] IrDA kernel log buster Hi Marcelo, I just ran 2.4.23, and after a few min the disk reached 100% capacity. A quick check lead to to oversized kernel log, and to the following changeset : http://linux.bkbits.net:8080/linux-2.4/cset@1.1136.23.2?nav=index.html|ChangeSet@-12w Patch to fix this problem is attached below, I've just backported the proper fixes from 2.5.X into 2.4.X. Probably this person did too much Python, but in C you need braces around multiple statements part of the same branch, so the second printf was always executed even when logging was disabled. I also don't understand why this person didn't decided to backport the 2.5.X fix. I'm also bit surprised that this kind of patch went into the kernel behind my back, because I though that freeze meant not accepting untested patch from random hacker. Have fun... Jean # This patch includes the following deltas: # ChangeSet 1.1276 -> 1.1277 # net/irda/irnet/irnet.h 1.11 -> 1.12 # irnet.h | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff -Nru a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h --- a/net/irda/irnet/irnet.h Sat Dec 13 06:02:55 2003 +++ b/net/irda/irnet/irnet.h Sat Dec 13 06:02:55 2003 @@ -322,29 +322,29 @@ * compiler will optimise away the if() in all cases. */ /* All error messages (will show up in the normal logs) */ -#define DERROR(dbg, args...) \ +#define DERROR(dbg, format, args...) \ {if(DEBUG_##dbg) \ - printk(KERN_INFO "irnet: %s(): ", __FUNCTION__); printk(args);} + printk(KERN_INFO "irnet: %s(): " format, __FUNCTION__ , ##args);} /* Normal debug message (will show up in /var/log/debug) */ -#define DEBUG(dbg, args...) \ +#define DEBUG(dbg, format, args...) \ {if(DEBUG_##dbg) \ - printk(KERN_DEBUG "irnet: %s(): ", __FUNCTION__); printk(args);} + printk(KERN_DEBUG "irnet: %s(): " format, __FUNCTION__ , ##args);} /* Entering a function (trace) */ -#define DENTER(dbg, args...) \ +#define DENTER(dbg, format, args...) \ {if(DEBUG_##dbg) \ - printk(KERN_DEBUG "irnet: ->%s", __FUNCTION__); printk(args);} + printk(KERN_DEBUG "irnet: -> %s" format, __FUNCTION__ , ##args);} /* Entering and exiting a function in one go (trace) */ -#define DPASS(dbg, args...) \ +#define DPASS(dbg, format, args...) \ {if(DEBUG_##dbg) \ - printk(KERN_DEBUG "irnet: <>%s", __FUNCTION__); printk(args);} + printk(KERN_DEBUG "irnet: <>%s" format, __FUNCTION__ , ##args);} /* Exiting a function (trace) */ -#define DEXIT(dbg, args...) \ +#define DEXIT(dbg, format, args...) \ {if(DEBUG_##dbg) \ - printk(KERN_DEBUG "irnet: <-%s()", __FUNCTION__); printk(args);} + printk(KERN_DEBUG "irnet: <-%s()" format, __FUNCTION__ , ##args);} /* Exit a function with debug */ #define DRETURN(ret, dbg, args...) \ - To unsubscribe from this list: send the line "unsubscribe bk-commits-24" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html