mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 23:32:14 +00:00
rxrpc: Tidy up the rxrpc_call struct a bit
Do a little tidying of the rxrpc_call struct: (1) in_clientflag is no longer compared against the value that's in the packet, so keeping it in this form isn't necessary. Use a flag in flags instead and provide a pair of wrapper functions. (2) We don't read the epoch value, so that can go. (3) Move what remains of the data that were used for hashing up in the struct to be with the channel number. (4) Get rid of the local pointer. We can get at this via the socket struct and we only use this in the procfs viewer. Signed-off-by: David Howells <dhowells@redhat.com>
This commit is contained in:
parent
26164e77ca
commit
dabe5a7906
5 changed files with 21 additions and 20 deletions
|
@ -167,10 +167,7 @@ static struct rxrpc_call *rxrpc_alloc_client_call(struct rxrpc_sock *rx,
|
|||
sock_hold(&rx->sk);
|
||||
call->socket = rx;
|
||||
call->rx_data_post = 1;
|
||||
|
||||
call->local = rx->local;
|
||||
call->service_id = srx->srx_service;
|
||||
call->in_clientflag = 0;
|
||||
|
||||
_leave(" = %p", call);
|
||||
return call;
|
||||
|
@ -323,6 +320,7 @@ struct rxrpc_call *rxrpc_incoming_call(struct rxrpc_sock *rx,
|
|||
candidate->channel = chan;
|
||||
candidate->rx_data_post = 0;
|
||||
candidate->state = RXRPC_CALL_SERVER_ACCEPTING;
|
||||
candidate->flags |= (1 << RXRPC_CALL_IS_SERVICE);
|
||||
if (conn->security_ix > 0)
|
||||
candidate->state = RXRPC_CALL_SERVER_SECURING;
|
||||
|
||||
|
@ -397,10 +395,7 @@ struct rxrpc_call *rxrpc_incoming_call(struct rxrpc_sock *rx,
|
|||
list_add_tail(&call->link, &rxrpc_calls);
|
||||
write_unlock_bh(&rxrpc_call_lock);
|
||||
|
||||
call->local = conn->params.local;
|
||||
call->epoch = conn->proto.epoch;
|
||||
call->service_id = conn->params.service_id;
|
||||
call->in_clientflag = RXRPC_CLIENT_INITIATED;
|
||||
|
||||
_net("CALL incoming %d on CONN %d", call->debug_id, call->conn->debug_id);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue