diff options
author | wangweidong <wangweidong1@huawei.com> | 2013-12-06 05:03:36 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-12-06 16:35:58 -0500 |
commit | 5cc208becb10ca271d8a3299a09a5449490c7591 (patch) | |
tree | 5baad9b261318b5d3e076df184aab044b12e84ee /net/unix | |
parent | 53bd674915379d91e0e505332c89741b34eab05c (diff) |
unix: convert printks to pr_<level>
use pr_<level> instead of printk(LEVEL)
Signed-off-by: Wang Weidong <wangweidong1@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix')
-rw-r--r-- | net/unix/af_unix.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 01625ccc3ae6..813622296317 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
@@ -80,6 +80,8 @@ | |||
80 | * with BSD names. | 80 | * with BSD names. |
81 | */ | 81 | */ |
82 | 82 | ||
83 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
84 | |||
83 | #include <linux/module.h> | 85 | #include <linux/module.h> |
84 | #include <linux/kernel.h> | 86 | #include <linux/kernel.h> |
85 | #include <linux/signal.h> | 87 | #include <linux/signal.h> |
@@ -366,7 +368,7 @@ static void unix_sock_destructor(struct sock *sk) | |||
366 | WARN_ON(!sk_unhashed(sk)); | 368 | WARN_ON(!sk_unhashed(sk)); |
367 | WARN_ON(sk->sk_socket); | 369 | WARN_ON(sk->sk_socket); |
368 | if (!sock_flag(sk, SOCK_DEAD)) { | 370 | if (!sock_flag(sk, SOCK_DEAD)) { |
369 | printk(KERN_INFO "Attempt to release alive unix socket: %p\n", sk); | 371 | pr_info("Attempt to release alive unix socket: %p\n", sk); |
370 | return; | 372 | return; |
371 | } | 373 | } |
372 | 374 | ||
@@ -378,7 +380,7 @@ static void unix_sock_destructor(struct sock *sk) | |||
378 | sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); | 380 | sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); |
379 | local_bh_enable(); | 381 | local_bh_enable(); |
380 | #ifdef UNIX_REFCNT_DEBUG | 382 | #ifdef UNIX_REFCNT_DEBUG |
381 | printk(KERN_DEBUG "UNIX %p is destroyed, %ld are still alive.\n", sk, | 383 | pr_debug("UNIX %p is destroyed, %ld are still alive.\n", sk, |
382 | atomic_long_read(&unix_nr_socks)); | 384 | atomic_long_read(&unix_nr_socks)); |
383 | #endif | 385 | #endif |
384 | } | 386 | } |
@@ -2433,8 +2435,7 @@ static int __init af_unix_init(void) | |||
2433 | 2435 | ||
2434 | rc = proto_register(&unix_proto, 1); | 2436 | rc = proto_register(&unix_proto, 1); |
2435 | if (rc != 0) { | 2437 | if (rc != 0) { |
2436 | printk(KERN_CRIT "%s: Cannot create unix_sock SLAB cache!\n", | 2438 | pr_crit("%s: Cannot create unix_sock SLAB cache!\n", __func__); |
2437 | __func__); | ||
2438 | goto out; | 2439 | goto out; |
2439 | } | 2440 | } |
2440 | 2441 | ||