rxrpc: Use pr_<level> and pr_fmt, reduce object size a few KB
Use the more common kernel logging style and reduce object size. The logging message prefix changes from a mixture of "RxRPC:" and "RXRPC:" to "af_rxrpc: ". $ size net/rxrpc/built-in.o* text data bss dec hex filename 64172 1972 8304 74448 122d0 net/rxrpc/built-in.o.new 67512 1972 8304 77788 12fdc net/rxrpc/built-in.o.old Miscellanea: o Consolidate the ASSERT macros to use a single pr_err call with decimal and hexadecimal output and a stringified #OP argument Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
cb2911fed6
commit
9b6d53985f
|
@ -9,6 +9,8 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/net.h>
|
||||
|
@ -796,49 +798,49 @@ static int __init af_rxrpc_init(void)
|
|||
"rxrpc_call_jar", sizeof(struct rxrpc_call), 0,
|
||||
SLAB_HWCACHE_ALIGN, NULL);
|
||||
if (!rxrpc_call_jar) {
|
||||
printk(KERN_NOTICE "RxRPC: Failed to allocate call jar\n");
|
||||
pr_notice("Failed to allocate call jar\n");
|
||||
goto error_call_jar;
|
||||
}
|
||||
|
||||
rxrpc_workqueue = alloc_workqueue("krxrpcd", 0, 1);
|
||||
if (!rxrpc_workqueue) {
|
||||
printk(KERN_NOTICE "RxRPC: Failed to allocate work queue\n");
|
||||
pr_notice("Failed to allocate work queue\n");
|
||||
goto error_work_queue;
|
||||
}
|
||||
|
||||
ret = rxrpc_init_security();
|
||||
if (ret < 0) {
|
||||
printk(KERN_CRIT "RxRPC: Cannot initialise security\n");
|
||||
pr_crit("Cannot initialise security\n");
|
||||
goto error_security;
|
||||
}
|
||||
|
||||
ret = proto_register(&rxrpc_proto, 1);
|
||||
if (ret < 0) {
|
||||
printk(KERN_CRIT "RxRPC: Cannot register protocol\n");
|
||||
pr_crit("Cannot register protocol\n");
|
||||
goto error_proto;
|
||||
}
|
||||
|
||||
ret = sock_register(&rxrpc_family_ops);
|
||||
if (ret < 0) {
|
||||
printk(KERN_CRIT "RxRPC: Cannot register socket family\n");
|
||||
pr_crit("Cannot register socket family\n");
|
||||
goto error_sock;
|
||||
}
|
||||
|
||||
ret = register_key_type(&key_type_rxrpc);
|
||||
if (ret < 0) {
|
||||
printk(KERN_CRIT "RxRPC: Cannot register client key type\n");
|
||||
pr_crit("Cannot register client key type\n");
|
||||
goto error_key_type;
|
||||
}
|
||||
|
||||
ret = register_key_type(&key_type_rxrpc_s);
|
||||
if (ret < 0) {
|
||||
printk(KERN_CRIT "RxRPC: Cannot register server key type\n");
|
||||
pr_crit("Cannot register server key type\n");
|
||||
goto error_key_type_s;
|
||||
}
|
||||
|
||||
ret = rxrpc_sysctl_init();
|
||||
if (ret < 0) {
|
||||
printk(KERN_CRIT "RxRPC: Cannot register sysctls\n");
|
||||
pr_crit("Cannot register sysctls\n");
|
||||
goto error_sysctls;
|
||||
}
|
||||
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/net.h>
|
||||
#include <linux/skbuff.h>
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/circ_buf.h>
|
||||
#include <linux/net.h>
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/slab.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/circ_buf.h>
|
||||
|
@ -669,8 +671,7 @@ void rxrpc_release_call(struct rxrpc_call *call)
|
|||
conn->channels[3] == NULL);
|
||||
break;
|
||||
default:
|
||||
printk(KERN_ERR "RxRPC: conn->avail_calls=%d\n",
|
||||
conn->avail_calls);
|
||||
pr_err("conn->avail_calls=%d\n", conn->avail_calls);
|
||||
BUG();
|
||||
}
|
||||
}
|
||||
|
@ -935,16 +936,15 @@ void __exit rxrpc_destroy_all_calls(void)
|
|||
if (call->state != RXRPC_CALL_DEAD)
|
||||
break;
|
||||
default:
|
||||
printk(KERN_ERR "RXRPC:"
|
||||
" Call %p still in use (%d,%d,%s,%lx,%lx)!\n",
|
||||
pr_err("Call %p still in use (%d,%d,%s,%lx,%lx)!\n",
|
||||
call, atomic_read(&call->usage),
|
||||
atomic_read(&call->ackr_not_idle),
|
||||
rxrpc_call_states[call->state],
|
||||
call->flags, call->events);
|
||||
if (!skb_queue_empty(&call->rx_queue))
|
||||
printk(KERN_ERR"RXRPC: Rx queue occupied\n");
|
||||
pr_err("Rx queue occupied\n");
|
||||
if (!skb_queue_empty(&call->rx_oos_queue))
|
||||
printk(KERN_ERR"RXRPC: OOS queue occupied\n");
|
||||
pr_err("OOS queue occupied\n");
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/net.h>
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/net.h>
|
||||
#include <linux/skbuff.h>
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/net.h>
|
||||
#include <linux/skbuff.h>
|
||||
|
|
|
@ -744,21 +744,18 @@ do { \
|
|||
#define ASSERT(X) \
|
||||
do { \
|
||||
if (unlikely(!(X))) { \
|
||||
printk(KERN_ERR "\n"); \
|
||||
printk(KERN_ERR "RxRPC: Assertion failed\n"); \
|
||||
pr_err("Assertion failed\n"); \
|
||||
BUG(); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define ASSERTCMP(X, OP, Y) \
|
||||
do { \
|
||||
if (unlikely(!((X) OP (Y)))) { \
|
||||
printk(KERN_ERR "\n"); \
|
||||
printk(KERN_ERR "RxRPC: Assertion failed\n"); \
|
||||
printk(KERN_ERR "%lu " #OP " %lu is false\n", \
|
||||
(unsigned long)(X), (unsigned long)(Y)); \
|
||||
printk(KERN_ERR "0x%lx " #OP " 0x%lx is false\n", \
|
||||
(unsigned long)(X), (unsigned long)(Y)); \
|
||||
unsigned long _x = (unsigned long)(X); \
|
||||
unsigned long _y = (unsigned long)(Y); \
|
||||
if (unlikely(!(_x OP _y))) { \
|
||||
pr_err("Assertion failed - %lu(0x%lx) %s %lu(0x%lx) is false\n", \
|
||||
_x, _x, #OP, _y, _y); \
|
||||
BUG(); \
|
||||
} \
|
||||
} while (0)
|
||||
|
@ -766,21 +763,18 @@ do { \
|
|||
#define ASSERTIF(C, X) \
|
||||
do { \
|
||||
if (unlikely((C) && !(X))) { \
|
||||
printk(KERN_ERR "\n"); \
|
||||
printk(KERN_ERR "RxRPC: Assertion failed\n"); \
|
||||
pr_err("Assertion failed\n"); \
|
||||
BUG(); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define ASSERTIFCMP(C, X, OP, Y) \
|
||||
do { \
|
||||
if (unlikely((C) && !((X) OP (Y)))) { \
|
||||
printk(KERN_ERR "\n"); \
|
||||
printk(KERN_ERR "RxRPC: Assertion failed\n"); \
|
||||
printk(KERN_ERR "%lu " #OP " %lu is false\n", \
|
||||
(unsigned long)(X), (unsigned long)(Y)); \
|
||||
printk(KERN_ERR "0x%lx " #OP " 0x%lx is false\n", \
|
||||
(unsigned long)(X), (unsigned long)(Y)); \
|
||||
unsigned long _x = (unsigned long)(X); \
|
||||
unsigned long _y = (unsigned long)(Y); \
|
||||
if (unlikely((C) && !(_x OP _y))) { \
|
||||
pr_err("Assertion failed - %lu(0x%lx) %s %lu(0x%lx) is false\n", \
|
||||
_x, _x, #OP, _y, _y); \
|
||||
BUG(); \
|
||||
} \
|
||||
} while (0)
|
||||
|
|
|
@ -12,6 +12,8 @@
|
|||
* "afs@CAMBRIDGE.REDHAT.COM>
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <crypto/skcipher.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/net.h>
|
||||
|
@ -800,7 +802,7 @@ static void rxrpc_free_token_list(struct rxrpc_key_token *token)
|
|||
rxrpc_rxk5_free(token->k5);
|
||||
break;
|
||||
default:
|
||||
printk(KERN_ERR "Unknown token type %x on rxrpc key\n",
|
||||
pr_err("Unknown token type %x on rxrpc key\n",
|
||||
token->security_index);
|
||||
BUG();
|
||||
}
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/net.h>
|
||||
#include <linux/skbuff.h>
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/net.h>
|
||||
#include <linux/gfp.h>
|
||||
#include <linux/skbuff.h>
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/net.h>
|
||||
#include <linux/skbuff.h>
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/net.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/export.h>
|
||||
|
@ -307,7 +309,7 @@ receive_non_data_message:
|
|||
&abort_code);
|
||||
break;
|
||||
default:
|
||||
pr_err("RxRPC: Unknown packet mark %u\n", skb->mark);
|
||||
pr_err("Unknown packet mark %u\n", skb->mark);
|
||||
BUG();
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/net.h>
|
||||
#include <linux/skbuff.h>
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/net.h>
|
||||
#include <linux/skbuff.h>
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <crypto/skcipher.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/net.h>
|
||||
|
|
Loading…
Reference in a new issue