Commit d4c76c1a authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'rxrpc-rewrite-20160613' of... 

Merge tag 'rxrpc-rewrite-20160613' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

David Howells says:

====================
rxrpc: Rename rxrpc source files

Here's the next part of the AF_RXRPC rewrite.  In this set I rename some of
the files in the net/rxrpc/ directory and adjust the Makefile and
ar-internal.h to reflect the changes.

The aim is twofold:

 (1) Remove the "ar-" prefix on those files that have it as it's not really
     useful, especially now that I'm building rxkad in.

 (2) To aid splitting the local, peer, connection and call handling code
     into separate files for object and event handling in future patches by
     making it easier to come up with new filenames.

There are two commits:

 (1) The first commit does a bunch of renames of .c files and alters the
     Makefile.  ar-internal.h isn't renamed at this time to avoid having to
     change the contents of the files being renamed.

 (2) The second commit changes the section label comments in ar-internal.h
     to reflect the changed filenames and reorders the file so that the
     sections are back in filename order.

The patches can be found here also:

	http://git.kernel.org/cgit/linux/kernel/git/dhowells/linux-fs.git/log/?h=rxrpc-rewrite

Tagged thusly:

	git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git


	rxrpc-rewrite-20160613
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4a63538e 0d81a51a

net/rxrpc/Makefile

+17 −17
Original line number Diff line number Diff line
@@ -4,25 +4,25 @@ 


af-rxrpc-y := \

	af_rxrpc.o \

	ar-accept.o \

	ar-ack.o \

	ar-call.o \

	ar-connection.o \

	ar-connevent.o \

	ar-error.o \

	ar-input.o \

	ar-key.o \

	ar-local.o \

	ar-output.o \

	ar-peer.o \

	ar-recvmsg.o \

	ar-security.o \

	ar-skbuff.o \

	ar-transport.o \

	call_accept.o \

	call_event.o \

	call_object.o \

	conn_event.o \

	conn_object.o \

	input.o \

	insecure.o \

	misc.o

	key.o \

	local_object.o \

	misc.o \

	output.o \

	peer_event.o \

	peer_object.o \

	recvmsg.o \

	security.o \

	skbuff.o \

	transport.o



af-rxrpc-$(CONFIG_PROC_FS) += ar-proc.o

af-rxrpc-$(CONFIG_PROC_FS) += proc.o

af-rxrpc-$(CONFIG_RXKAD) += rxkad.o

af-rxrpc-$(CONFIG_SYSCTL) += sysctl.o

net/rxrpc/ar-internal.h

+69 −69
Original line number Diff line number Diff line
@@ -482,21 +482,21 @@ extern struct rxrpc_transport *rxrpc_name_to_transport(struct rxrpc_sock *, 
						       int, int, gfp_t);



/*

 * ar-accept.c

 * call_accept.c

 */

void rxrpc_accept_incoming_calls(struct work_struct *);

struct rxrpc_call *rxrpc_accept_call(struct rxrpc_sock *, unsigned long);

int rxrpc_reject_call(struct rxrpc_sock *);



/*

 * ar-ack.c

 * call_event.c

 */

void __rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool);

void rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool);

void rxrpc_process_call(struct work_struct *);



/*

 * ar-call.c

 * call_object.c

 */

extern unsigned int rxrpc_max_call_lifetime;

extern unsigned int rxrpc_dead_call_expiry;
@@ -520,7 +520,14 @@ void __rxrpc_put_call(struct rxrpc_call *); 
void __exit rxrpc_destroy_all_calls(void);



/*

 * ar-connection.c

 * conn_event.c

 */

void rxrpc_process_connection(struct work_struct *);

void rxrpc_reject_packet(struct rxrpc_local *, struct sk_buff *);

void rxrpc_reject_packets(struct work_struct *);



/*

 * conn_object.c

 */

extern unsigned int rxrpc_connection_expiry;

extern struct list_head rxrpc_connections;
@@ -540,27 +547,30 @@ extern struct rxrpc_connection * 
rxrpc_incoming_connection(struct rxrpc_transport *, struct rxrpc_host_header *);



/*

 * ar-connevent.c

 * input.c

 */

void rxrpc_process_connection(struct work_struct *);

void rxrpc_reject_packet(struct rxrpc_local *, struct sk_buff *);

void rxrpc_reject_packets(struct work_struct *);

void rxrpc_data_ready(struct sock *);

int rxrpc_queue_rcv_skb(struct rxrpc_call *, struct sk_buff *, bool, bool);

void rxrpc_fast_process_packet(struct rxrpc_call *, struct sk_buff *);



/*

 * ar-error.c

 * insecure.c

 */

void rxrpc_UDP_error_report(struct sock *);

void rxrpc_UDP_error_handler(struct work_struct *);

extern const struct rxrpc_security rxrpc_no_security;



/*

 * ar-input.c

 * key.c

 */

void rxrpc_data_ready(struct sock *);

int rxrpc_queue_rcv_skb(struct rxrpc_call *, struct sk_buff *, bool, bool);

void rxrpc_fast_process_packet(struct rxrpc_call *, struct sk_buff *);

extern struct key_type key_type_rxrpc;

extern struct key_type key_type_rxrpc_s;



int rxrpc_request_key(struct rxrpc_sock *, char __user *, int);

int rxrpc_server_keyring(struct rxrpc_sock *, char __user *, int);

int rxrpc_get_server_data_key(struct rxrpc_connection *, const void *, time_t,

			      u32);



/*

 * ar-local.c

 * local_object.c

 */

extern rwlock_t rxrpc_local_lock;
@@ -569,18 +579,23 @@ void rxrpc_put_local(struct rxrpc_local *); 
void __exit rxrpc_destroy_all_locals(void);



/*

 * ar-key.c

 * misc.c

 */

extern struct key_type key_type_rxrpc;

extern struct key_type key_type_rxrpc_s;

extern unsigned int rxrpc_max_backlog __read_mostly;

extern unsigned int rxrpc_requested_ack_delay;

extern unsigned int rxrpc_soft_ack_delay;

extern unsigned int rxrpc_idle_ack_delay;

extern unsigned int rxrpc_rx_window_size;

extern unsigned int rxrpc_rx_mtu;

extern unsigned int rxrpc_rx_jumbo_max;



int rxrpc_request_key(struct rxrpc_sock *, char __user *, int);

int rxrpc_server_keyring(struct rxrpc_sock *, char __user *, int);

int rxrpc_get_server_data_key(struct rxrpc_connection *, const void *, time_t,

			      u32);

extern const char *const rxrpc_pkts[];

extern const s8 rxrpc_ack_priority[];



extern const char *rxrpc_acks(u8 reason);



/*

 * ar-output.c

 * output.c

 */

extern unsigned int rxrpc_resend_timeout;
@@ -588,7 +603,13 @@ int rxrpc_send_packet(struct rxrpc_transport *, struct sk_buff *); 
int rxrpc_do_sendmsg(struct rxrpc_sock *, struct msghdr *, size_t);



/*

 * ar-peer.c

 * peer_error.c

 */

void rxrpc_UDP_error_report(struct sock *);

void rxrpc_UDP_error_handler(struct work_struct *);



/*

 * peer_object.c

 */

struct rxrpc_peer *rxrpc_get_peer(struct sockaddr_rxrpc *, gfp_t);

void rxrpc_put_peer(struct rxrpc_peer *);
@@ -596,20 +617,27 @@ struct rxrpc_peer *rxrpc_find_peer(struct rxrpc_local *, __be32, __be16); 
void __exit rxrpc_destroy_all_peers(void);



/*

 * ar-proc.c

 * proc.c

 */

extern const char *const rxrpc_call_states[];

extern const struct file_operations rxrpc_call_seq_fops;

extern const struct file_operations rxrpc_connection_seq_fops;



/*

 * ar-recvmsg.c

 * recvmsg.c

 */

void rxrpc_remove_user_ID(struct rxrpc_sock *, struct rxrpc_call *);

int rxrpc_recvmsg(struct socket *, struct msghdr *, size_t, int);



/*

 * ar-security.c

 * rxkad.c

 */

#ifdef CONFIG_RXKAD

extern const struct rxrpc_security rxkad;

#endif



/*

 * security.c

 */

int __init rxrpc_init_security(void);

void rxrpc_exit_security(void);
@@ -617,50 +645,10 @@ int rxrpc_init_client_conn_security(struct rxrpc_connection *); 
int rxrpc_init_server_conn_security(struct rxrpc_connection *);



/*

 * ar-skbuff.c

 * skbuff.c

 */

void rxrpc_packet_destructor(struct sk_buff *);



/*

 * ar-transport.c

 */

extern unsigned int rxrpc_transport_expiry;



struct rxrpc_transport *rxrpc_get_transport(struct rxrpc_local *,

					    struct rxrpc_peer *, gfp_t);

void rxrpc_put_transport(struct rxrpc_transport *);

void __exit rxrpc_destroy_all_transports(void);

struct rxrpc_transport *rxrpc_find_transport(struct rxrpc_local *,

					     struct rxrpc_peer *);



/*

 * insecure.c

 */

extern const struct rxrpc_security rxrpc_no_security;



/*

 * misc.c

 */

extern unsigned int rxrpc_max_backlog __read_mostly;

extern unsigned int rxrpc_requested_ack_delay;

extern unsigned int rxrpc_soft_ack_delay;

extern unsigned int rxrpc_idle_ack_delay;

extern unsigned int rxrpc_rx_window_size;

extern unsigned int rxrpc_rx_mtu;

extern unsigned int rxrpc_rx_jumbo_max;



extern const char *const rxrpc_pkts[];

extern const s8 rxrpc_ack_priority[];



extern const char *rxrpc_acks(u8 reason);



/*

 * rxkad.c

 */

#ifdef CONFIG_RXKAD

extern const struct rxrpc_security rxkad;

#endif



/*

 * sysctl.c

 */
@@ -672,6 +660,18 @@ static inline int __init rxrpc_sysctl_init(void) { return 0; } 
static inline void rxrpc_sysctl_exit(void) {}

#endif



/*

 * transport.c

 */

extern unsigned int rxrpc_transport_expiry;



struct rxrpc_transport *rxrpc_get_transport(struct rxrpc_local *,

					    struct rxrpc_peer *, gfp_t);

void rxrpc_put_transport(struct rxrpc_transport *);

void __exit rxrpc_destroy_all_transports(void);

struct rxrpc_transport *rxrpc_find_transport(struct rxrpc_local *,

					     struct rxrpc_peer *);



/*

 * debug tracing

 */

net/rxrpc/ar-accept.c→net/rxrpc/call_accept.c

+0 −0

File moved.

View file

net/rxrpc/ar-ack.c→net/rxrpc/call_event.c

+0 −0

File moved.

View file

net/rxrpc/ar-call.c→net/rxrpc/call_object.c

+0 −0

File moved.

View file

CRA Git | Maintained and supported by SUSTech CRA and CCSE