Skip to content

Commit 550130a

Browse files
committed
rxrpc: Kill service bundle
Now that the bundle->channel_lock has been eliminated, we don't need the dummy service bundle anymore. It's purpose was purely to provide the channel_lock for service connections. Signed-off-by: David Howells <dhowells@redhat.com> cc: Marc Dionne <marc.dionne@auristor.com> cc: linux-afs@lists.infradead.org
1 parent 83836eb commit 550130a

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

net/rxrpc/conn_service.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
#include <linux/slab.h>
99
#include "ar-internal.h"
1010

11-
static struct rxrpc_bundle rxrpc_service_dummy_bundle = {
12-
.ref = REFCOUNT_INIT(1),
13-
.debug_id = UINT_MAX,
14-
};
15-
1611
/*
1712
* Find a service connection under RCU conditions.
1813
*
@@ -132,8 +127,6 @@ struct rxrpc_connection *rxrpc_prealloc_service_connection(struct rxrpc_net *rxn
132127
*/
133128
conn->state = RXRPC_CONN_SERVICE_PREALLOC;
134129
refcount_set(&conn->ref, 2);
135-
conn->bundle = rxrpc_get_bundle(&rxrpc_service_dummy_bundle,
136-
rxrpc_bundle_get_service_conn);
137130

138131
atomic_inc(&rxnet->nr_conns);
139132
write_lock(&rxnet->conn_lock);

0 commit comments

Comments
 (0)