From: David Howells <dhowells@redhat.com>
Date: Wed, 16 Nov 2022 16:42:02 +0000 (+0000)
Subject: rxrpc: Kill service bundle
X-Git-Tag: v6.6.17~5509^2~157^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=550130a0ce303f7cd754c7067b0a971ca179db63;p=platform%2Fkernel%2Flinux-rpi.git

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
---

diff --git a/net/rxrpc/conn_service.c b/net/rxrpc/conn_service.c
index f30323d..89ac05a 100644
--- a/net/rxrpc/conn_service.c
+++ b/net/rxrpc/conn_service.c
@@ -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);