2003-06-07 18:47:34

by Ren

Subject: [PATCH 2.5-bk] Some more stuff missed during the struct sock cleanup

Hi all,

the members of struct sock got a prefix of 'sk_' recently. This patch
renames them in smbfs, too.

Ren?



diff -u ./fs/smbfs/sock.c~ ./fs/smbfs/sock.c
--- ./fs/smbfs/sock.c~ 2003-06-07 20:27:22.000000000 +0200
+++ ./fs/smbfs/sock.c 2003-06-07 20:27:29.000000000 +0200
@@ -68,7 +68,7 @@
static struct smb_sb_info *
server_from_socket(struct socket *socket)
{
- return socket->sk->user_data;
+ return socket->sk->sk_user_data;
}

/*
@@ -77,7 +77,7 @@
void
smb_data_ready(struct sock *sk, int len)
{
- struct smb_sb_info *server = server_from_socket(sk->socket);
+ struct smb_sb_info *server = server_from_socket(sk->sk_socket);
void (*data_ready)(struct sock *, int) = server->data_ready;

data_ready(sk, len);
@@ -117,7 +117,7 @@
struct socket *sock = server_sock(server);

VERBOSE("closing socket %p\n", sock);
- sock->sk->data_ready = server->data_ready;
+ sock->sk->sk_data_ready = server->data_ready;
server->sock_file = NULL;
fput(file);
}
@@ -226,7 +226,7 @@
sock = server_sock(server);
if (!sock)
goto out;
- if (sock->sk->state != TCP_ESTABLISHED)
+ if (sock->sk->sk_state != TCP_ESTABLISHED)
goto out;

if (!server->smb_read) {
@@ -290,7 +290,7 @@
sock = server_sock(server);
if (!sock)
goto out;
- if (sock->sk->state != TCP_ESTABLISHED)
+ if (sock->sk->sk_state != TCP_ESTABLISHED)
goto out;

fs = get_fs();
@@ -345,7 +345,7 @@
sock = server_sock(server);
if (!sock)
goto out;
- if (sock->sk->state != TCP_ESTABLISHED)
+ if (sock->sk->sk_state != TCP_ESTABLISHED)
goto out;

fs = get_fs();
@@ -400,7 +400,7 @@
sock = server_sock(server);
if (!sock)
goto out;
- if (sock->sk->state != TCP_ESTABLISHED)
+ if (sock->sk->sk_state != TCP_ESTABLISHED)
goto out;

msg.msg_name = NULL;
diff -u ./fs/smbfs/proc.c~ ./fs/smbfs/proc.c
--- ./fs/smbfs/proc.c~ 2003-06-07 20:27:22.000000000 +0200
+++ ./fs/smbfs/proc.c 2003-06-07 20:27:29.000000000 +0200
@@ -900,10 +900,10 @@
* Store the server in sock user_data (Only used by sunrpc)
*/
sk = SOCKET_I(filp->f_dentry->d_inode)->sk;
- sk->user_data = server;
+ sk->sk_user_data = server;

/* chain into the data_ready callback */
- server->data_ready = xchg(&sk->data_ready, smb_data_ready);
+ server->data_ready = xchg(&sk->sk_data_ready, smb_data_ready);

/* check if we have an old smbmount that uses seconds for the
serverzone */