summaryrefslogtreecommitdiffstats
path: root/fs/nilfs2/segment.h
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-11-18 00:29:32 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-18 01:10:03 +0100
commit7554e9c4cfa208acf3164a86c05aaa967b043425 (patch)
treefd89423abb2149756c766de38062d04959ac3988 /fs/nilfs2/segment.h
parentsysctl: check for UINT_MAX before unsigned int min/max (diff)
downloadlinux-7554e9c4cfa208acf3164a86c05aaa967b043425.tar.xz
linux-7554e9c4cfa208acf3164a86c05aaa967b043425.zip
fs/nilfs2: 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. This requires adding a pointer to hold the timer's target task, as the lifetime of sc_task doesn't appear to match the timer's task. Link: http://lkml.kernel.org/r/20171016235900.GA102729@beast Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/nilfs2/segment.h')
-rw-r--r--fs/nilfs2/segment.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nilfs2/segment.h b/fs/nilfs2/segment.h
index 1060949d7dd2..84084a4d9b3e 100644
--- a/fs/nilfs2/segment.h
+++ b/fs/nilfs2/segment.h
@@ -180,6 +180,7 @@ struct nilfs_sc_info {
unsigned long sc_watermark;
struct timer_list sc_timer;
+ struct task_struct *sc_timer_task;
struct task_struct *sc_task;
};