Commit 550130a0 authored by David Howells's avatar David Howells
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
parent 83836eb4

net/rxrpc/conn_service.c

+0 −7
Original line number Diff line number Diff line
@@ -8,11 +8,6 @@ 
#include <linux/slab.h>

#include "ar-internal.h"



static struct rxrpc_bundle rxrpc_service_dummy_bundle = {

	.ref		= REFCOUNT_INIT(1),

	.debug_id	= UINT_MAX,

};



/*

 * Find a service connection under RCU conditions.

 *
@@ -132,8 +127,6 @@ struct rxrpc_connection *rxrpc_prealloc_service_connection(struct rxrpc_net *rxn 
		 */

		conn->state = RXRPC_CONN_SERVICE_PREALLOC;

		refcount_set(&conn->ref, 2);

		conn->bundle = rxrpc_get_bundle(&rxrpc_service_dummy_bundle,

						rxrpc_bundle_get_service_conn);



		atomic_inc(&rxnet->nr_conns);

		write_lock(&rxnet->conn_lock);