Commit 9b6d5398 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cb2911fe

net/rxrpc/af_rxrpc.c

+10 −8
Original line number Diff line number Diff line
@@ -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;

	}

net/rxrpc/ar-accept.c

+2 −0
Original line number Diff line number Diff line
@@ -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>

net/rxrpc/ar-ack.c

+2 −0
Original line number Diff line number Diff line
@@ -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>

net/rxrpc/ar-call.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

		}

net/rxrpc/ar-connection.c

+2 −0
Original line number Diff line number Diff line
@@ -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>

CRA Git | Maintained and supported by SUSTech CRA and CCSE