diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-24 15:59:06 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-24 15:59:06 +0100 |
| commit | 5d8e4bddc635dd61ab8b3bcb75c59934e9c1e19f (patch) | |
| tree | cfb5bc7a3f089117e9bdeda19b76e309c02efaba /fs/ncpfs | |
| parent | f094cfc6c382cec7b2c77dd7798576684153acbb (diff) | |
| download | linux-stable-5d8e4bddc635dd61ab8b3bcb75c59934e9c1e19f.tar.gz linux-stable-5d8e4bddc635dd61ab8b3bcb75c59934e9c1e19f.tar.bz2 linux-stable-5d8e4bddc635dd61ab8b3bcb75c59934e9c1e19f.zip | |
ncpfs: don't use flush_scheduled_work()
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly flush the used works on stop instead.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Petr Vandrovec <petr@vandrovec.name>
Diffstat (limited to 'fs/ncpfs')
| -rw-r--r-- | fs/ncpfs/inode.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c index 8fb93b604e73..31532330d016 100644 --- a/fs/ncpfs/inode.c +++ b/fs/ncpfs/inode.c @@ -309,7 +309,12 @@ static void ncp_stop_tasks(struct ncp_server *server) { sk->sk_write_space = server->write_space; release_sock(sk); del_timer_sync(&server->timeout_tm); - flush_scheduled_work(); + + flush_work_sync(&server->rcv.tq); + if (sk->sk_socket->type == SOCK_STREAM) + flush_work_sync(&server->tx.tq); + else + flush_work_sync(&server->timeout_tq); } static int ncp_show_options(struct seq_file *seq, struct vfsmount *mnt) |