diff options
| author | Geliang Tang <geliangtang@gmail.com> | 2017-05-03 14:51:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-03 15:52:07 -0700 |
| commit | 667b8a37f34b39f752f59f4808762bd5c7688a71 (patch) | |
| tree | 48e0d5a150f2ed05f9d18d32aebdc1c0ce687188 /fs | |
| parent | accce8e7e8b769ec2430bc0f4a8a2b23c68c1837 (diff) | |
| download | op-kernel-dev-667b8a37f34b39f752f59f4808762bd5c7688a71.zip op-kernel-dev-667b8a37f34b39f752f59f4808762bd5c7688a71.tar.gz | |
fs/ocfs2/cluster: use setup_timer
Use setup_timer() instead of init_timer() to simplify the code.
Link: http://lkml.kernel.org/r/5e75bf07beb91e092d5aa36c36769949a480456a.1489060564.git.geliangtang@gmail.com
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/cluster/tcp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index 5b51c31..a4a6ba2 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c @@ -450,9 +450,8 @@ static struct o2net_sock_container *sc_alloc(struct o2nm_node *node) INIT_WORK(&sc->sc_shutdown_work, o2net_shutdown_sc); INIT_DELAYED_WORK(&sc->sc_keepalive_work, o2net_sc_send_keep_req); - init_timer(&sc->sc_idle_timeout); - sc->sc_idle_timeout.function = o2net_idle_timer; - sc->sc_idle_timeout.data = (unsigned long)sc; + setup_timer(&sc->sc_idle_timeout, o2net_idle_timer, + (unsigned long)sc); sclog(sc, "alloced\n"); |
