Message ID | 52A16A19.60001@huawei.com |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
On 12/06/2013 07:09 AM, Wang Weidong wrote: > use pr_<level> instead of printk(LEVEL) > > Signed-off-by: Wang Weidong <wangweidong1@huawei.com> > --- > net/unix/af_unix.c | 10 ++++++---- > 1 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c > index 4155ed3..ca98e61 100644 > --- a/net/unix/af_unix.c > +++ b/net/unix/af_unix.c > @@ -80,6 +80,9 @@ > * with BSD names. > */ > > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > +#define DEBUG > + Why do you define DEBUG here ? > #include <linux/module.h> > #include <linux/kernel.h> > #include <linux/signal.h> > @@ -366,7 +369,7 @@ static void unix_sock_destructor(struct sock *sk) > WARN_ON(!sk_unhashed(sk)); > WARN_ON(sk->sk_socket); > if (!sock_flag(sk, SOCK_DEAD)) { > - printk(KERN_INFO "Attempt to release alive unix socket: %p\n", sk); > + pr_info("Attempt to release alive unix socket: %p\n", sk); > return; > } > > @@ -378,7 +381,7 @@ static void unix_sock_destructor(struct sock *sk) > sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); > local_bh_enable(); > #ifdef UNIX_REFCNT_DEBUG > - printk(KERN_DEBUG "UNIX %p is destroyed, %ld are still alive.\n", sk, > + pr_debug("UNIX %p is destroyed, %ld are still alive.\n", sk, > atomic_long_read(&unix_nr_socks)); > #endif > } > @@ -2434,8 +2437,7 @@ static int __init af_unix_init(void) > > rc = proto_register(&unix_proto, 1); > if (rc != 0) { > - printk(KERN_CRIT "%s: Cannot create unix_sock SLAB cache!\n", > - __func__); > + pr_crit("%s: Cannot create unix_sock SLAB cache!\n", __func__); > goto out; > } > > -- 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/12/6 17:22, Daniel Borkmann wrote: > On 12/06/2013 07:09 AM, Wang Weidong wrote: >> use pr_<level> instead of printk(LEVEL) >> >> Signed-off-by: Wang Weidong <wangweidong1@huawei.com> >> --- >> net/unix/af_unix.c | 10 ++++++---- >> 1 files changed, 6 insertions(+), 4 deletions(-) >> >> diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c >> index 4155ed3..ca98e61 100644 >> --- a/net/unix/af_unix.c >> +++ b/net/unix/af_unix.c >> @@ -80,6 +80,9 @@ >> * with BSD names. >> */ >> >> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt >> +#define DEBUG >> + > > Why do you define DEBUG here ? > I think the pr_debug != printk(KERN_DEBUG), equal when define DEBUG. Regards. Wang >> #include <linux/module.h> >> #include <linux/kernel.h> >> #include <linux/signal.h> >> @@ -366,7 +369,7 @@ static void unix_sock_destructor(struct sock *sk) >> WARN_ON(!sk_unhashed(sk)); >> WARN_ON(sk->sk_socket); >> if (!sock_flag(sk, SOCK_DEAD)) { >> - printk(KERN_INFO "Attempt to release alive unix socket: %p\n", sk); >> + pr_info("Attempt to release alive unix socket: %p\n", sk); >> return; >> } >> >> @@ -378,7 +381,7 @@ static void unix_sock_destructor(struct sock *sk) >> sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); >> local_bh_enable(); >> #ifdef UNIX_REFCNT_DEBUG >> - printk(KERN_DEBUG "UNIX %p is destroyed, %ld are still alive.\n", sk, >> + pr_debug("UNIX %p is destroyed, %ld are still alive.\n", sk, >> atomic_long_read(&unix_nr_socks)); >> #endif >> } >> @@ -2434,8 +2437,7 @@ static int __init af_unix_init(void) >> >> rc = proto_register(&unix_proto, 1); >> if (rc != 0) { >> - printk(KERN_CRIT "%s: Cannot create unix_sock SLAB cache!\n", >> - __func__); >> + pr_crit("%s: Cannot create unix_sock SLAB cache!\n", __func__); >> goto out; >> } >> >> > > . > -- 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 12/06/2013 10:32 AM, Wang Weidong wrote: > On 2013/12/6 17:22, Daniel Borkmann wrote: >> On 12/06/2013 07:09 AM, Wang Weidong wrote: >>> use pr_<level> instead of printk(LEVEL) >>> >>> Signed-off-by: Wang Weidong <wangweidong1@huawei.com> >>> --- >>> net/unix/af_unix.c | 10 ++++++---- >>> 1 files changed, 6 insertions(+), 4 deletions(-) >>> >>> diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c >>> index 4155ed3..ca98e61 100644 >>> --- a/net/unix/af_unix.c >>> +++ b/net/unix/af_unix.c >>> @@ -80,6 +80,9 @@ >>> * with BSD names. >>> */ >>> >>> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt >>> +#define DEBUG >>> + >> >> Why do you define DEBUG here ? >> > I think the pr_debug != printk(KERN_DEBUG), equal when define DEBUG. Ok, then please read Documentation/dynamic-debug-howto.txt pr_debug() is part of the dynamic debugging framework and can be enabled / disabled at runtime when configured. So that define does not belong here. -- 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/12/6 17:40, Daniel Borkmann wrote: > On 12/06/2013 10:32 AM, Wang Weidong wrote: >> On 2013/12/6 17:22, Daniel Borkmann wrote: >>> On 12/06/2013 07:09 AM, Wang Weidong wrote: >>>> use pr_<level> instead of printk(LEVEL) >>>> >>>> Signed-off-by: Wang Weidong <wangweidong1@huawei.com> >>>> --- >>>> net/unix/af_unix.c | 10 ++++++---- >>>> 1 files changed, 6 insertions(+), 4 deletions(-) >>>> >>>> diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c >>>> index 4155ed3..ca98e61 100644 >>>> --- a/net/unix/af_unix.c >>>> +++ b/net/unix/af_unix.c >>>> @@ -80,6 +80,9 @@ >>>> * with BSD names. >>>> */ >>>> >>>> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt >>>> +#define DEBUG >>>> + >>> >>> Why do you define DEBUG here ? >>> >> I think the pr_debug != printk(KERN_DEBUG), equal when define DEBUG. > > Ok, then please read Documentation/dynamic-debug-howto.txt > > pr_debug() is part of the dynamic debugging framework and > can be enabled / disabled at runtime when configured. So > that define does not belong here. > Yes, You are right. I will fix it. Thanks. > -- 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/unix/af_unix.c b/net/unix/af_unix.c index 4155ed3..ca98e61 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -80,6 +80,9 @@ * with BSD names. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define DEBUG + #include <linux/module.h> #include <linux/kernel.h> #include <linux/signal.h> @@ -366,7 +369,7 @@ static void unix_sock_destructor(struct sock *sk) WARN_ON(!sk_unhashed(sk)); WARN_ON(sk->sk_socket); if (!sock_flag(sk, SOCK_DEAD)) { - printk(KERN_INFO "Attempt to release alive unix socket: %p\n", sk); + pr_info("Attempt to release alive unix socket: %p\n", sk); return; } @@ -378,7 +381,7 @@ static void unix_sock_destructor(struct sock *sk) sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); local_bh_enable(); #ifdef UNIX_REFCNT_DEBUG - printk(KERN_DEBUG "UNIX %p is destroyed, %ld are still alive.\n", sk, + pr_debug("UNIX %p is destroyed, %ld are still alive.\n", sk, atomic_long_read(&unix_nr_socks)); #endif } @@ -2434,8 +2437,7 @@ static int __init af_unix_init(void) rc = proto_register(&unix_proto, 1); if (rc != 0) { - printk(KERN_CRIT "%s: Cannot create unix_sock SLAB cache!\n", - __func__); + pr_crit("%s: Cannot create unix_sock SLAB cache!\n", __func__); goto out; }
use pr_<level> instead of printk(LEVEL) Signed-off-by: Wang Weidong <wangweidong1@huawei.com> --- net/unix/af_unix.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)