Commit 26164e77 authored by David Howells's avatar David Howells
Browse files

rxrpc: Remove RXRPC_CALL_PROC_BUSY 



Remove RXRPC_CALL_PROC_BUSY as work queue items are now 100% non-reentrant.

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

net/rxrpc/ar-internal.h

+0 −1
Original line number Diff line number Diff line
@@ -341,7 +341,6 @@ enum rxrpc_call_flag { 
	RXRPC_CALL_RCVD_LAST,		/* all packets received */

	RXRPC_CALL_RUN_RTIMER,		/* Tx resend timer started */

	RXRPC_CALL_TX_SOFT_ACK,		/* sent some soft ACKs */

	RXRPC_CALL_PROC_BUSY,		/* the processor is busy */

	RXRPC_CALL_INIT_ACCEPT,		/* acceptance was initiated */

	RXRPC_CALL_HAS_USERID,		/* has a user ID attached */

	RXRPC_CALL_EXPECT_OOS,		/* expect out of sequence packets */

net/rxrpc/call_event.c

+0 −6
Original line number Diff line number Diff line
@@ -832,11 +832,6 @@ void rxrpc_process_call(struct work_struct *work) 
	       call->debug_id, rxrpc_call_states[call->state], call->events,

	       (jiffies - call->creation_jif) / (HZ / 10));



	if (test_and_set_bit(RXRPC_CALL_PROC_BUSY, &call->flags)) {

		_debug("XXXXXXXXXXXXX RUNNING ON MULTIPLE CPUS XXXXXXXXXXXXX");

		return;

	}



	if (!call->conn)

		goto skip_msg_init;
@@ -1281,7 +1276,6 @@ void rxrpc_process_call(struct work_struct *work) 
	}



error:

	clear_bit(RXRPC_CALL_PROC_BUSY, &call->flags);

	kfree(acks);



	/* because we don't want two CPUs both processing the work item for one