OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
accce8e
)
fs/ocfs2/cluster: use setup_timer
author
Geliang Tang
<geliangtang@gmail.com>
Wed, 3 May 2017 21:51:38 +0000
(14:51 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Wed, 3 May 2017 22:52:07 +0000
(15:52 -0700)
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>
fs/ocfs2/cluster/tcp.c
patch
|
blob
|
history
diff --git
a/fs/ocfs2/cluster/tcp.c
b/fs/ocfs2/cluster/tcp.c
index
5b51c31
..
a4a6ba2
100644
(file)
--- 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");