Subject: afs/net/rxrpc proc.c,1.6,1.7

From: [email-masked]
Date: Mon, 19 Jan 2004 10:00:01 +0000

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

Modified Files:
	proc.c 
Log Message:
merge in change to use SEQ_START_TOKEN

Index: proc.c
===================================================================
RCS file: /home/cvs/afs/net/rxrpc/proc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- proc.c	12 Aug 2003 17:04:02 -0000	1.6
+++ proc.c	19 Jan 2004 09:59:58 -0000	1.7
@@ -222,7 +222,7 @@
 
 	/* allow for the header line */
 	if (!pos)
-		return (void *) 1;
+		return SEQ_START_TOKEN;
 	pos--;
 
 	/* find the n'th element in the list */
@@ -244,7 +244,7 @@
 	(*pos)++;
 
 	_p = v;
-	_p = v==(void *) 1 ? rxrpc_proc_transports.next : _p->next;
+	_p = (v == SEQ_START_TOKEN) ? rxrpc_proc_transports.next : _p->next;
 
 	return _p != &rxrpc_proc_transports ? _p : NULL;
 } /* end rxrpc_proc_transports_next() */
@@ -269,7 +269,7 @@
 		list_entry(v, struct rxrpc_transport, proc_link);
 
 	/* display header on line 1 */
-	if (v == (void *) 1) {
+	if (v == SEQ_START_TOKEN) {
 		seq_puts(m, "LOCAL USE\n");
 		return 0;
 	}
@@ -317,7 +317,7 @@
 
 	/* allow for the header line */
 	if (!pos)
-		return (void *) 1;
+		return SEQ_START_TOKEN;
 	pos--;
 
 	/* find the n'th element in the list */
@@ -339,7 +339,7 @@
 	(*pos)++;
 
 	_p = v;
-	_p = v == (void *) 1 ? rxrpc_peers.next : _p->next;
+	_p = (v == SEQ_START_TOKEN) ? rxrpc_peers.next : _p->next;
 
 	return _p != &rxrpc_peers ? _p : NULL;
 } /* end rxrpc_proc_peers_next() */
@@ -364,7 +364,7 @@
 	signed long timeout;
 
 	/* display header on line 1 */
-	if (v == (void *) 1) {
+	if (v == SEQ_START_TOKEN) {
 		seq_puts(m, "LOCAL REMOTE   USAGE CONNS  TIMEOUT"
 			 "   MTU RTT(uS)\n");
 		return 0;
@@ -424,7 +424,7 @@
 
 	/* allow for the header line */
 	if (!pos)
-		return (void *) 1;
+		return SEQ_START_TOKEN;
 	pos--;
 
 	/* find the n'th element in the list */
@@ -446,7 +446,7 @@
 	(*pos)++;
 
 	_p = v;
-	_p = (v == (void *) 1) ? rxrpc_conns.next : _p->next;
+	_p = (v == SEQ_START_TOKEN) ? rxrpc_conns.next : _p->next;
 
 	return _p != &rxrpc_conns ? _p : NULL;
 } /* end rxrpc_proc_conns_next() */
@@ -473,7 +473,7 @@
 	conn = list_entry(v, struct rxrpc_connection, proc_link);
 
 	/* display header on line 1 */
-	if (v == (void *) 1) {
+	if (v == SEQ_START_TOKEN) {
 		seq_puts(m,
 			 "LOCAL REMOTE   RPORT SRVC CONN     END SERIALNO "
 			 "CALLNO     MTU  TIMEOUT"
@@ -538,7 +538,7 @@
 
 	/* allow for the header line */
 	if (!pos)
-		return (void *) 1;
+		return SEQ_START_TOKEN;
 	pos--;
 
 	/* find the n'th element in the list */
@@ -560,7 +560,7 @@
 	(*pos)++;
 
 	_p = v;
-	_p = (v == (void *) 1) ? rxrpc_calls.next : _p->next;
+	_p = (v == SEQ_START_TOKEN) ? rxrpc_calls.next : _p->next;
 
 	return _p != &rxrpc_calls ? _p : NULL;
 } /* end rxrpc_proc_calls_next() */
@@ -584,7 +584,7 @@
 	struct rxrpc_call *call = list_entry(v, struct rxrpc_call, call_link);
 
 	/* display header on line 1 */
-	if (v == (void *) 1) {
+	if (v == SEQ_START_TOKEN) {
 		seq_puts(m,
 			 "LOCAL REMOT SRVC CONN     CALL     DIR USE "
 			 " L STATE   OPCODE ABORT    ERRNO\n"