git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
ncpfs
/
sock.c
diff --git
a/fs/ncpfs/sock.c
b/fs/ncpfs/sock.c
index
8783eb7
..
e496d8b
100644
(file)
--- a/
fs/ncpfs/sock.c
+++ b/
fs/ncpfs/sock.c
@@
-8,7
+8,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/time.h>
#include <linux/errno.h>
#include <linux/time.h>
#include <linux/errno.h>
@@
-351,9
+350,10
@@
static void info_server(struct ncp_server *server, unsigned int id, const void *
}
}
}
}
-void ncpdgram_rcv_proc(
void *s
)
+void ncpdgram_rcv_proc(
struct work_struct *work
)
{
{
- struct ncp_server *server = s;
+ struct ncp_server *server =
+ container_of(work, struct ncp_server, rcv.tq);
struct socket* sock;
sock = server->ncp_sock;
struct socket* sock;
sock = server->ncp_sock;
@@
-469,9
+469,10
@@
static void __ncpdgram_timeout_proc(struct ncp_server *server)
}
}
}
}
-void ncpdgram_timeout_proc(
void *s
)
+void ncpdgram_timeout_proc(
struct work_struct *work
)
{
{
- struct ncp_server *server = s;
+ struct ncp_server *server =
+ container_of(work, struct ncp_server, timeout_tq);
mutex_lock(&server->rcv.creq_mutex);
__ncpdgram_timeout_proc(server);
mutex_unlock(&server->rcv.creq_mutex);
mutex_lock(&server->rcv.creq_mutex);
__ncpdgram_timeout_proc(server);
mutex_unlock(&server->rcv.creq_mutex);
@@
-653,18
+654,20
@@
skipdata:;
}
}
}
}
-void ncp_tcp_rcv_proc(
void *s
)
+void ncp_tcp_rcv_proc(
struct work_struct *work
)
{
{
- struct ncp_server *server = s;
+ struct ncp_server *server =
+ container_of(work, struct ncp_server, rcv.tq);
mutex_lock(&server->rcv.creq_mutex);
__ncptcp_rcv_proc(server);
mutex_unlock(&server->rcv.creq_mutex);
}
mutex_lock(&server->rcv.creq_mutex);
__ncptcp_rcv_proc(server);
mutex_unlock(&server->rcv.creq_mutex);
}
-void ncp_tcp_tx_proc(
void *s
)
+void ncp_tcp_tx_proc(
struct work_struct *work
)
{
{
- struct ncp_server *server = s;
+ struct ncp_server *server =
+ container_of(work, struct ncp_server, tx.tq);
mutex_lock(&server->rcv.creq_mutex);
__ncptcp_try_send(server);
mutex_lock(&server->rcv.creq_mutex);
__ncptcp_try_send(server);