Commit a641fd00 authored by David Howells's avatar David Howells
Browse files

rxrpc: Abstract out rxtx ring cleanup 



Abstract out rxtx ring cleanup into its own function from its two callers.
This makes it easier to apply the same changes to both.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 4858e403

net/rxrpc/call_object.c

+17 −16
Original line number Diff line number Diff line
@@ -421,6 +421,21 @@ void rxrpc_get_call(struct rxrpc_call *call, enum rxrpc_call_trace op) 
	trace_rxrpc_call(call, op, n, here, NULL);

}



/*

 * Clean up the RxTx skb ring.

 */

static void rxrpc_cleanup_ring(struct rxrpc_call *call)

{

	int i;



	for (i = 0; i < RXRPC_RXTX_BUFF_SIZE; i++) {

		rxrpc_free_skb(call->rxtx_buffer[i],

			       (call->tx_phase ? rxrpc_skb_tx_cleaned :

				rxrpc_skb_rx_cleaned));

		call->rxtx_buffer[i] = NULL;

	}

}



/*

 * Detach a call from its owning socket.

 */
@@ -429,7 +444,6 @@ void rxrpc_release_call(struct rxrpc_sock *rx, struct rxrpc_call *call) 
	const void *here = __builtin_return_address(0);

	struct rxrpc_connection *conn = call->conn;

	bool put = false;

	int i;



	_enter("{%d,%d}", call->debug_id, atomic_read(&call->usage));
@@ -479,13 +493,7 @@ void rxrpc_release_call(struct rxrpc_sock *rx, struct rxrpc_call *call) 
	if (conn)

		rxrpc_disconnect_call(call);



	for (i = 0; i < RXRPC_RXTX_BUFF_SIZE; i++) {

		rxrpc_free_skb(call->rxtx_buffer[i],

			       (call->tx_phase ? rxrpc_skb_tx_cleaned :

				rxrpc_skb_rx_cleaned));

		call->rxtx_buffer[i] = NULL;

	}



	rxrpc_cleanup_ring(call);

	_leave("");

}
@@ -568,8 +576,6 @@ static void rxrpc_rcu_destroy_call(struct rcu_head *rcu) 
 */

void rxrpc_cleanup_call(struct rxrpc_call *call)

{

	int i;



	_net("DESTROY CALL %d", call->debug_id);



	memset(&call->sock_node, 0xcd, sizeof(call->sock_node));
@@ -580,12 +586,7 @@ void rxrpc_cleanup_call(struct rxrpc_call *call) 
	ASSERT(test_bit(RXRPC_CALL_RELEASED, &call->flags));

	ASSERTCMP(call->conn, ==, NULL);



	/* Clean up the Rx/Tx buffer */

	for (i = 0; i < RXRPC_RXTX_BUFF_SIZE; i++)

		rxrpc_free_skb(call->rxtx_buffer[i],

			       (call->tx_phase ? rxrpc_skb_tx_cleaned :

				rxrpc_skb_rx_cleaned));



	rxrpc_cleanup_ring(call);

	rxrpc_free_skb(call->tx_pending, rxrpc_skb_tx_cleaned);



	call_rcu(&call->rcu, rxrpc_rcu_destroy_call);