p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fs/ncpfs: Convert timers to use timer_setup() 

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Petr Vandrovec <petr@vandrovec.name>
Cc: Jan Kara <jack@suse.cz>
Cc: Jens Axboe <axboe@fb.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Kees Cook 2017-08-29 21:00:21 -07:00
parent fd30b717b8
commit 9b5dfbdd1f
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/ncpfs/inode.c
View File

@ -618,7 +618,7 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
server->tx.creq = NULL; server->tx.creq = NULL;
server->rcv.creq = NULL; server->rcv.creq = NULL;
init_timer(&server->timeout_tm); timer_setup(&server->timeout_tm, ncpdgram_timeout_call, 0);
#undef NCP_PACKET_SIZE #undef NCP_PACKET_SIZE
#define NCP_PACKET_SIZE 131072 #define NCP_PACKET_SIZE 131072
error = -ENOMEM; error = -ENOMEM;
@ -650,8 +650,6 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
} else { } else {
INIT_WORK(&server->rcv.tq, ncpdgram_rcv_proc); INIT_WORK(&server->rcv.tq, ncpdgram_rcv_proc);
INIT_WORK(&server->timeout_tq, ncpdgram_timeout_proc); INIT_WORK(&server->timeout_tq, ncpdgram_timeout_proc);
server->timeout_tm.data = (unsigned long)server;
server->timeout_tm.function = ncpdgram_timeout_call;
} }
release_sock(sock->sk); release_sock(sock->sk);

2
fs/ncpfs/ncp_fs_sb.h
View File

@ -149,7 +149,7 @@ extern void ncp_tcp_rcv_proc(struct work_struct *work);
extern void ncp_tcp_tx_proc(struct work_struct *work); extern void ncp_tcp_tx_proc(struct work_struct *work);
extern void ncpdgram_rcv_proc(struct work_struct *work); extern void ncpdgram_rcv_proc(struct work_struct *work);
extern void ncpdgram_timeout_proc(struct work_struct *work); extern void ncpdgram_timeout_proc(struct work_struct *work);
extern void ncpdgram_timeout_call(unsigned long server); extern void ncpdgram_timeout_call(struct timer_list *t);
extern void ncp_tcp_data_ready(struct sock* sk); extern void ncp_tcp_data_ready(struct sock* sk);
extern void ncp_tcp_write_space(struct sock* sk); extern void ncp_tcp_write_space(struct sock* sk);
extern void ncp_tcp_error_report(struct sock* sk); extern void ncp_tcp_error_report(struct sock* sk);

4
fs/ncpfs/sock.c
View File

@ -116,9 +116,9 @@ void ncp_tcp_write_space(struct sock *sk)
schedule_work(&server->tx.tq); schedule_work(&server->tx.tq);
} }
void ncpdgram_timeout_call(unsigned long v) void ncpdgram_timeout_call(struct timer_list *t)
{ {
struct ncp_server *server = (void*)v; struct ncp_server *server = from_timer(server, t, timeout_tm);
schedule_work(&server->timeout_tq); schedule_work(&server->timeout_tq);
} }