Commit 1f8481d1 authored by David Howells's avatar David Howells Committed by David S. Miller
Browse files

[AF_RXRPC]: Make call state names available if CONFIG_PROC_FS=n 



Make the call state names array available even if CONFIG_PROC_FS is
disabled as it's used in other places (such as debugging statements)
too.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 71a904bf

net/rxrpc/ar-call.c

+19 −0
Original line number Diff line number Diff line
@@ -15,6 +15,25 @@ 
#include <net/af_rxrpc.h>

#include "ar-internal.h"



const char *rxrpc_call_states[] = {

	[RXRPC_CALL_CLIENT_SEND_REQUEST]	= "ClSndReq",

	[RXRPC_CALL_CLIENT_AWAIT_REPLY]		= "ClAwtRpl",

	[RXRPC_CALL_CLIENT_RECV_REPLY]		= "ClRcvRpl",

	[RXRPC_CALL_CLIENT_FINAL_ACK]		= "ClFnlACK",

	[RXRPC_CALL_SERVER_SECURING]		= "SvSecure",

	[RXRPC_CALL_SERVER_ACCEPTING]		= "SvAccept",

	[RXRPC_CALL_SERVER_RECV_REQUEST]	= "SvRcvReq",

	[RXRPC_CALL_SERVER_ACK_REQUEST]		= "SvAckReq",

	[RXRPC_CALL_SERVER_SEND_REPLY]		= "SvSndRpl",

	[RXRPC_CALL_SERVER_AWAIT_ACK]		= "SvAwtACK",

	[RXRPC_CALL_COMPLETE]			= "Complete",

	[RXRPC_CALL_SERVER_BUSY]		= "SvBusy  ",

	[RXRPC_CALL_REMOTELY_ABORTED]		= "RmtAbort",

	[RXRPC_CALL_LOCALLY_ABORTED]		= "LocAbort",

	[RXRPC_CALL_NETWORK_ERROR]		= "NetError",

	[RXRPC_CALL_DEAD]			= "Dead    ",

};



struct kmem_cache *rxrpc_call_jar;

LIST_HEAD(rxrpc_calls);

DEFINE_RWLOCK(rxrpc_call_lock);

net/rxrpc/ar-proc.c

+0 −19
Original line number Diff line number Diff line
@@ -25,25 +25,6 @@ static const char *rxrpc_conn_states[] = { 
	[RXRPC_CONN_NETWORK_ERROR]	= "NetError",

};



const char *rxrpc_call_states[] = {

	[RXRPC_CALL_CLIENT_SEND_REQUEST]	= "ClSndReq",

	[RXRPC_CALL_CLIENT_AWAIT_REPLY]		= "ClAwtRpl",

	[RXRPC_CALL_CLIENT_RECV_REPLY]		= "ClRcvRpl",

	[RXRPC_CALL_CLIENT_FINAL_ACK]		= "ClFnlACK",

	[RXRPC_CALL_SERVER_SECURING]		= "SvSecure",

	[RXRPC_CALL_SERVER_ACCEPTING]		= "SvAccept",

	[RXRPC_CALL_SERVER_RECV_REQUEST]	= "SvRcvReq",

	[RXRPC_CALL_SERVER_ACK_REQUEST]		= "SvAckReq",

	[RXRPC_CALL_SERVER_SEND_REPLY]		= "SvSndRpl",

	[RXRPC_CALL_SERVER_AWAIT_ACK]		= "SvAwtACK",

	[RXRPC_CALL_COMPLETE]			= "Complete",

	[RXRPC_CALL_SERVER_BUSY]		= "SvBusy  ",

	[RXRPC_CALL_REMOTELY_ABORTED]		= "RmtAbort",

	[RXRPC_CALL_LOCALLY_ABORTED]		= "LocAbort",

	[RXRPC_CALL_NETWORK_ERROR]		= "NetError",

	[RXRPC_CALL_DEAD]			= "Dead    ",

};



/*

 * generate a list of extant and dead calls in /proc/net/rxrpc_calls

 */