| Message ID | 1383790412-41944-4-git-send-email-yangyingliang@huawei.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On 11/07/2013 03:13 AM, Yang Yingliang wrote: > Replace printk(KERN_DEBUG ...) with pr_debug() and > replace pr_warning() with pr_warn(). > > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > --- > net/sched/sch_cbq.c | 2 +- > net/sched/sch_dsmark.c | 2 +- > net/sched/sch_gred.c | 4 ++-- > net/sched/sch_htb.c | 6 +++--- > 4 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c > index a8f40f5..9e3a9dc 100644 > --- a/net/sched/sch_cbq.c > +++ b/net/sched/sch_cbq.c > @@ -1060,7 +1060,7 @@ static void cbq_normalize_quanta(struct cbq_sched_data *q, int prio) > } > if (cl->quantum <= 0 || > cl->quantum > 32*qdisc_dev(cl->qdisc)->mtu) { > - pr_warning("CBQ: class %08x has bad quantum==%ld, repaired.\n", > + pr_warn("CBQ: class %08x has bad quantum==%ld, repaired.\n", > cl->common.classid, cl->quantum); You also need to fix alignment of the second line here and in all other places you did changes like that. > cl->quantum = qdisc_dev(cl->qdisc)->mtu/2 + 1; > } > diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c > index 3886365..190cf65 100644 > --- a/net/sched/sch_dsmark.c > +++ b/net/sched/sch_dsmark.c > @@ -303,7 +303,7 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch) > * and don't need yet another qdisc as a bypass. > */ > if (p->mask[index] != 0xff || p->value[index]) > - pr_warning("dsmark_dequeue: unsupported protocol %d\n", > + pr_warn("dsmark_dequeue: unsupported protocol %d\n", > ntohs(skb->protocol)); > break; > } > diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c > index d42234c..19fa4dc 100644 > --- a/net/sched/sch_gred.c > +++ b/net/sched/sch_gred.c > @@ -370,7 +370,7 @@ static inline int gred_change_table_def(struct Qdisc *sch, struct nlattr *dps) > > for (i = table->DPs; i < MAX_DPs; i++) { > if (table->tab[i]) { > - pr_warning("GRED: Warning: Destroying " > + pr_warn("GRED: Warning: Destroying " > "shadowed VQ 0x%x\n", i); > gred_destroy_vq(table->tab[i]); > table->tab[i] = NULL; > @@ -456,7 +456,7 @@ static int gred_change(struct Qdisc *sch, struct nlattr *opt) > if (table->tab[table->def]) > def_prio = table->tab[table->def]->prio; > > - printk(KERN_DEBUG "GRED: DP %u does not have a prio " > + pr_debug("GRED: DP %u does not have a prio " > "setting default to %d\n", ctl->DP, def_prio); > > prio = def_prio; > diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c > index f6e8a74..6586f3b 100644 > --- a/net/sched/sch_htb.c > +++ b/net/sched/sch_htb.c > @@ -712,7 +712,7 @@ static s64 htb_do_events(struct htb_sched *q, const int level, > > /* too much load - let's continue after a break for scheduling */ > if (!(q->warned & HTB_WARN_TOOMANYEVENTS)) { > - pr_warning("htb: too many events!\n"); > + pr_warn("htb: too many events!\n"); > q->warned |= HTB_WARN_TOOMANYEVENTS; > } > > @@ -1484,13 +1484,13 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, > if (!cl->level) { > cl->quantum = hopt->rate.rate / q->rate2quantum; > if (!hopt->quantum && cl->quantum < 1000) { > - pr_warning( > + pr_warn( > "HTB: quantum of class %X is small. Consider r2q change.\n", Also, this looks quite ugly, so changing into pr_warn("HTB: .....") would be better if you're at it anyway. > cl->common.classid); > cl->quantum = 1000; > } > if (!hopt->quantum && cl->quantum > 200000) { > - pr_warning( > + pr_warn( > "HTB: quantum of class %X is big. Consider r2q change.\n", > cl->common.classid); Ditto > cl->quantum = 200000; > -- 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
On 2013/11/7 16:30, Daniel Borkmann wrote: > On 11/07/2013 03:13 AM, Yang Yingliang wrote: >> Replace printk(KERN_DEBUG ...) with pr_debug() and >> replace pr_warning() with pr_warn(). >> >> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> >> --- >> net/sched/sch_cbq.c | 2 +- >> net/sched/sch_dsmark.c | 2 +- >> net/sched/sch_gred.c | 4 ++-- >> net/sched/sch_htb.c | 6 +++--- >> 4 files changed, 7 insertions(+), 7 deletions(-) >> >> diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c >> index a8f40f5..9e3a9dc 100644 >> --- a/net/sched/sch_cbq.c >> +++ b/net/sched/sch_cbq.c >> @@ -1060,7 +1060,7 @@ static void cbq_normalize_quanta(struct cbq_sched_data *q, int prio) >> } >> if (cl->quantum <= 0 || >> cl->quantum > 32*qdisc_dev(cl->qdisc)->mtu) { >> - pr_warning("CBQ: class %08x has bad quantum==%ld, repaired.\n", >> + pr_warn("CBQ: class %08x has bad quantum==%ld, repaired.\n", >> cl->common.classid, cl->quantum); > > You also need to fix alignment of the second line here and in all other places > you did changes like that. > >> cl->quantum = qdisc_dev(cl->qdisc)->mtu/2 + 1; >> } >> diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c >> index 3886365..190cf65 100644 >> --- a/net/sched/sch_dsmark.c >> +++ b/net/sched/sch_dsmark.c >> @@ -303,7 +303,7 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch) >> * and don't need yet another qdisc as a bypass. >> */ >> if (p->mask[index] != 0xff || p->value[index]) >> - pr_warning("dsmark_dequeue: unsupported protocol %d\n", >> + pr_warn("dsmark_dequeue: unsupported protocol %d\n", >> ntohs(skb->protocol)); >> break; >> } >> diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c >> index d42234c..19fa4dc 100644 >> --- a/net/sched/sch_gred.c >> +++ b/net/sched/sch_gred.c >> @@ -370,7 +370,7 @@ static inline int gred_change_table_def(struct Qdisc *sch, struct nlattr *dps) >> >> for (i = table->DPs; i < MAX_DPs; i++) { >> if (table->tab[i]) { >> - pr_warning("GRED: Warning: Destroying " >> + pr_warn("GRED: Warning: Destroying " >> "shadowed VQ 0x%x\n", i); >> gred_destroy_vq(table->tab[i]); >> table->tab[i] = NULL; >> @@ -456,7 +456,7 @@ static int gred_change(struct Qdisc *sch, struct nlattr *opt) >> if (table->tab[table->def]) >> def_prio = table->tab[table->def]->prio; >> >> - printk(KERN_DEBUG "GRED: DP %u does not have a prio " >> + pr_debug("GRED: DP %u does not have a prio " >> "setting default to %d\n", ctl->DP, def_prio); >> >> prio = def_prio; >> diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c >> index f6e8a74..6586f3b 100644 >> --- a/net/sched/sch_htb.c >> +++ b/net/sched/sch_htb.c >> @@ -712,7 +712,7 @@ static s64 htb_do_events(struct htb_sched *q, const int level, >> >> /* too much load - let's continue after a break for scheduling */ >> if (!(q->warned & HTB_WARN_TOOMANYEVENTS)) { >> - pr_warning("htb: too many events!\n"); >> + pr_warn("htb: too many events!\n"); >> q->warned |= HTB_WARN_TOOMANYEVENTS; >> } >> >> @@ -1484,13 +1484,13 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, >> if (!cl->level) { >> cl->quantum = hopt->rate.rate / q->rate2quantum; >> if (!hopt->quantum && cl->quantum < 1000) { >> - pr_warning( >> + pr_warn( >> "HTB: quantum of class %X is small. Consider r2q change.\n", > > Also, this looks quite ugly, so changing into pr_warn("HTB: .....") would be better if > you're at it anyway. Thanks, i will fix it in v3. > >> cl->common.classid); >> cl->quantum = 1000; >> } >> if (!hopt->quantum && cl->quantum > 200000) { >> - pr_warning( >> + pr_warn( >> "HTB: quantum of class %X is big. Consider r2q change.\n", >> cl->common.classid); > > Ditto > >> cl->quantum = 200000; >> > > . > -- 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
Hello. On 07-11-2013 6:13, Yang Yingliang wrote: > Replace printk(KERN_DEBUG ...) with pr_debug() and Note that this is not an equivalent change: first variant always prints the message, while pr_debug() only does this if DEBUG is #define'd or dynamic debugging is enabled. > replace pr_warning() with pr_warn(). This should probably be in a separate patch. > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > --- > net/sched/sch_cbq.c | 2 +- > net/sched/sch_dsmark.c | 2 +- > net/sched/sch_gred.c | 4 ++-- > net/sched/sch_htb.c | 6 +++--- > 4 files changed, 7 insertions(+), 7 deletions(-) > diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c > index a8f40f5..9e3a9dc 100644 > --- a/net/sched/sch_cbq.c > +++ b/net/sched/sch_cbq.c > @@ -1060,7 +1060,7 @@ static void cbq_normalize_quanta(struct cbq_sched_data *q, int prio) > } > if (cl->quantum <= 0 || > cl->quantum > 32*qdisc_dev(cl->qdisc)->mtu) { > - pr_warning("CBQ: class %08x has bad quantum==%ld, repaired.\n", > + pr_warn("CBQ: class %08x has bad quantum==%ld, repaired.\n", > cl->common.classid, cl->quantum); You should also adjust indentation of the continuation line. Same comment to the code furhter below... [...] > diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c > index f6e8a74..6586f3b 100644 > --- a/net/sched/sch_htb.c > +++ b/net/sched/sch_htb.c > @@ -1484,13 +1484,13 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, > if (!cl->level) { > cl->quantum = hopt->rate.rate / q->rate2quantum; > if (!hopt->quantum && cl->quantum < 1000) { > - pr_warning( > + pr_warn( > "HTB: quantum of class %X is small. Consider r2q change.\n", It would have been good if you moved the string literal to the preceding line. Same comment to the below code. WBR, Sergei -- 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
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index a8f40f5..9e3a9dc 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c @@ -1060,7 +1060,7 @@ static void cbq_normalize_quanta(struct cbq_sched_data *q, int prio) } if (cl->quantum <= 0 || cl->quantum > 32*qdisc_dev(cl->qdisc)->mtu) { - pr_warning("CBQ: class %08x has bad quantum==%ld, repaired.\n", + pr_warn("CBQ: class %08x has bad quantum==%ld, repaired.\n", cl->common.classid, cl->quantum); cl->quantum = qdisc_dev(cl->qdisc)->mtu/2 + 1; } diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c index 3886365..190cf65 100644 --- a/net/sched/sch_dsmark.c +++ b/net/sched/sch_dsmark.c @@ -303,7 +303,7 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch) * and don't need yet another qdisc as a bypass. */ if (p->mask[index] != 0xff || p->value[index]) - pr_warning("dsmark_dequeue: unsupported protocol %d\n", + pr_warn("dsmark_dequeue: unsupported protocol %d\n", ntohs(skb->protocol)); break; } diff --git a/net/sched/sch_gred.c b/net/sched/sch_gred.c index d42234c..19fa4dc 100644 --- a/net/sched/sch_gred.c +++ b/net/sched/sch_gred.c @@ -370,7 +370,7 @@ static inline int gred_change_table_def(struct Qdisc *sch, struct nlattr *dps) for (i = table->DPs; i < MAX_DPs; i++) { if (table->tab[i]) { - pr_warning("GRED: Warning: Destroying " + pr_warn("GRED: Warning: Destroying " "shadowed VQ 0x%x\n", i); gred_destroy_vq(table->tab[i]); table->tab[i] = NULL; @@ -456,7 +456,7 @@ static int gred_change(struct Qdisc *sch, struct nlattr *opt) if (table->tab[table->def]) def_prio = table->tab[table->def]->prio; - printk(KERN_DEBUG "GRED: DP %u does not have a prio " + pr_debug("GRED: DP %u does not have a prio " "setting default to %d\n", ctl->DP, def_prio); prio = def_prio; diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index f6e8a74..6586f3b 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -712,7 +712,7 @@ static s64 htb_do_events(struct htb_sched *q, const int level, /* too much load - let's continue after a break for scheduling */ if (!(q->warned & HTB_WARN_TOOMANYEVENTS)) { - pr_warning("htb: too many events!\n"); + pr_warn("htb: too many events!\n"); q->warned |= HTB_WARN_TOOMANYEVENTS; } @@ -1484,13 +1484,13 @@ static int htb_change_class(struct Qdisc *sch, u32 classid, if (!cl->level) { cl->quantum = hopt->rate.rate / q->rate2quantum; if (!hopt->quantum && cl->quantum < 1000) { - pr_warning( + pr_warn( "HTB: quantum of class %X is small. Consider r2q change.\n", cl->common.classid); cl->quantum = 1000; } if (!hopt->quantum && cl->quantum > 200000) { - pr_warning( + pr_warn( "HTB: quantum of class %X is big. Consider r2q change.\n", cl->common.classid); cl->quantum = 200000;
Replace printk(KERN_DEBUG ...) with pr_debug() and replace pr_warning() with pr_warn(). Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- net/sched/sch_cbq.c | 2 +- net/sched/sch_dsmark.c | 2 +- net/sched/sch_gred.c | 4 ++-- net/sched/sch_htb.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-)