afs/net/rxrpc transport.c,1.3,1.4
dwh at infradead.org
dwh at infradead.org
Tue Jul 1 19:46:11 BST 2003
Update of /home/cvs/afs/net/rxrpc
In directory phoenix.infradead.org:/tmp/cvs-serv18541/net/rxrpc
Modified Files:
transport.c
Log Message:
certain struct sock members have acquired an "sk_" prefix
Index: transport.c
===================================================================
RCS file: /home/cvs/afs/net/rxrpc/transport.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- transport.c 16 Oct 2002 11:59:44 -0000 1.3
+++ transport.c 1 Jul 2003 17:46:09 -0000 1.4
@@ -112,9 +112,9 @@
/* set the socket up */
sock = trans->socket->sk;
- sock->user_data = trans;
- sock->data_ready = rxrpc_data_ready;
- sock->error_report = rxrpc_error_report;
+ sock->sk_user_data = trans;
+ sock->sk_data_ready = rxrpc_data_ready;
+ sock->sk_error_report = rxrpc_error_report;
down_write(&rxrpc_proc_transports_sem);
list_add_tail(&trans->proc_link,&rxrpc_proc_transports);
@@ -184,7 +184,7 @@
/* close the socket */
if (trans->socket) {
- trans->socket->sk->user_data = NULL;
+ trans->socket->sk->sk_user_data = NULL;
sock_release(trans->socket);
trans->socket = NULL;
}
@@ -255,16 +255,16 @@
{
struct rxrpc_transport *trans;
- _enter("%p{t=%p},%d",sk,sk->user_data,count);
+ _enter("%p{t=%p},%d",sk,sk->sk_user_data,count);
/* queue the transport for attention by krxiod */
- trans = (struct rxrpc_transport *) sk->user_data;
+ trans = (struct rxrpc_transport *) sk->sk_user_data;
if (trans)
rxrpc_krxiod_queue_transport(trans);
/* wake up anyone waiting on the socket */
- if (sk->sleep && waitqueue_active(sk->sleep))
- wake_up_interruptible(sk->sleep);
+ if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
+ wake_up_interruptible(sk->sk_sleep);
_leave("");
@@ -279,18 +279,18 @@
{
struct rxrpc_transport *trans;
- _enter("%p{t=%p}",sk,sk->user_data);
+ _enter("%p{t=%p}",sk,sk->sk_user_data);
/* queue the transport for attention by krxiod */
- trans = (struct rxrpc_transport *) sk->user_data;
+ trans = (struct rxrpc_transport *) sk->sk_user_data;
if (trans) {
trans->error_rcvd = 1;
rxrpc_krxiod_queue_transport(trans);
}
/* wake up anyone waiting on the socket */
- if (sk->sleep && waitqueue_active(sk->sleep))
- wake_up_interruptible(sk->sleep);
+ if (sk->sk_sleep && waitqueue_active(sk->sk_sleep))
+ wake_up_interruptible(sk->sk_sleep);
_leave("");
More information about the linux-afs-cvs
mailing list