patch-2.2.18 linux/include/linux/sunrpc/svcsock.h

Next file: linux/include/linux/sunrpc/types.h
Previous file: linux/include/linux/sunrpc/sched.h
Back to the patch index
Back to the overall index

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/include/linux/sunrpc/svcsock.h linux/include/linux/sunrpc/svcsock.h
@@ -25,13 +25,13 @@
 
 	struct svc_serv *	sk_server;	/* service for this socket */
 	atomic_t		sk_inuse;	/* use count */
-	unsigned char		sk_busy;	/* enqueued/receiving */
-	unsigned char		sk_conn;	/* conn pending */
-	unsigned char		sk_close;	/* dead or dying */
-	int			sk_data;	/* data pending */
-	unsigned int		sk_temp : 1,	/* temp socket */
+	volatile int		sk_conn;	/* conn pending */
+	volatile int		sk_data;	/* data pending */
+	volatile unsigned char	sk_busy : 1,	/* enqueued/receiving */
+				sk_close: 1,	/* dead or dying */
 				sk_qued : 1,	/* on serv->sk_sockets */
 				sk_dead : 1;	/* socket closed */
+	unsigned char		sk_temp : 1;	/* temp socket */
 	int			(*sk_recvfrom)(struct svc_rqst *rqstp);
 	int			(*sk_sendto)(struct svc_rqst *rqstp);
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)