Subject: afs/include/rxrpc transport.h,1.1.1.1,1.2 peer.h,1.2,1.3 connection.h,1.3,1.4

From: [email-masked]
Date: Fri, 15 Aug 2003 14:03:50 +0100

Update of /home/cvs/afs/include/rxrpc
In directory phoenix.infradead.org:/tmp/cvs-serv16042/include/rxrpc

Modified Files:
	transport.h peer.h connection.h 
Log Message:
number local connections using consecutive integers (stepping 4) rather than
assumed 32-bit pointer values

Index: transport.h
===================================================================
RCS file: /home/cvs/afs/include/rxrpc/transport.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- transport.h	19 Jun 2002 13:33:55 -0000	1.1.1.1
+++ transport.h	15 Aug 2003 13:03:48 -0000	1.2
@@ -85,10 +85,11 @@
 
 static inline void rxrpc_get_transport(struct rxrpc_transport *trans)
 {
-	if (atomic_read(&trans->usage)<=0)
+	if (atomic_read(&trans->usage) <= 0)
 		BUG();
 	atomic_inc(&trans->usage);
-	//printk("rxrpc_get_transport(%p{u=%d})\n",trans,atomic_read(&trans->usage));
+	//printk("rxrpc_get_transport(%p{u=%d})\n",
+	//       trans, atomic_read(&trans->usage));
 }
 
 extern void rxrpc_put_transport(struct rxrpc_transport *trans);
@@ -98,11 +99,6 @@
 
 extern void rxrpc_del_service(struct rxrpc_transport *trans,
 			      struct rxrpc_service *srv);
-
-#if 0
-extern int rxrpc_trans_add_connection(struct rxrpc_transport *trans,
-				      struct rxrpc_connection *conn);
-#endif
 
 extern void rxrpc_trans_receive_packet(struct rxrpc_transport *trans);

Index: peer.h
===================================================================
RCS file: /home/cvs/afs/include/rxrpc/peer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- peer.h	17 Oct 2002 15:24:41 -0000	1.2
+++ peer.h	15 Aug 2003 13:03:48 -0000	1.3
@@ -42,7 +42,10 @@
 	struct rxrpc_timer	timeout;	/* timeout for grave destruction */
 	struct list_head	link;		/* link in transport's peer list */
 	struct list_head	proc_link;	/* link in /proc list */
-	rwlock_t		conn_lock;	/* lock for connections */
+	rwlock_t		conn_idlock;	/* lock for connection IDs */
+	struct list_head	conn_idlist;	/* list of connections granted IDs */
+	uint32_t		conn_idcounter;	/* connection ID counter */
+	rwlock_t		conn_lock;	/* lock for active/dead connections */
 	struct list_head	conn_active;	/* active connections to/from this peer */
 	struct list_head	conn_graveyard;	/* graveyard for inactive connections */
 	spinlock_t		conn_gylock;	/* lock for conn_graveyard */

Index: connection.h
===================================================================
RCS file: /home/cvs/afs/include/rxrpc/connection.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- connection.h	13 Aug 2003 10:05:27 -0000	1.3
+++ connection.h	15 Aug 2003 13:03:48 -0000	1.4
@@ -34,6 +34,7 @@
 	struct list_head	link;		/* link in peer's list */
 	struct list_head	proc_link;	/* link in proc list */
 	struct list_head	err_link;	/* link in ICMP error processing list */
+	struct list_head	id_link;	/* link in ID grant list */
 	struct sockaddr_in	addr;		/* remote address */
 	struct rxrpc_call	*channels[4];	/* channels (active calls) */
 	wait_queue_head_t	chanwait;	/* wait for channel to become available */