OSDN Git Service

rxrpc: Remove RXRPC_CALL_PROC_BUSY
authorDavid Howells <dhowells@redhat.com>
Tue, 23 Aug 2016 14:27:23 +0000 (15:27 +0100)
committerDavid Howells <dhowells@redhat.com>
Tue, 23 Aug 2016 14:27:23 +0000 (15:27 +0100)
Remove RXRPC_CALL_PROC_BUSY as work queue items are now 100% non-reentrant.

Signed-off-by: David Howells <dhowells@redhat.com>
net/rxrpc/ar-internal.h
net/rxrpc/call_event.c

index ff83fb1..3a2f4c2 100644 (file)
@@ -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 */
index e60cf65..eaa8035 100644 (file)
@@ -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 @@ maybe_reschedule:
        }
 
 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