summaryrefslogtreecommitdiff
path: root/fs/nilfs2/segment.h
diff options
context:
space:
mode:
authorRyusuke Konishi <konishi.ryusuke@gmail.com>2024-08-27 02:41:14 +0900
committerAndrew Morton <akpm@linux-foundation.org>2024-09-01 20:43:43 -0700
commitcfdfe9e17c4142cb556f34f25f93f4f85ca494f0 (patch)
treeef5d09fa07a278a48e7d1b60376b34017578a90f /fs/nilfs2/segment.h
parent33d23d849610df330ffb02420df705730a79f8e8 (diff)
nilfs2: remove sc_timer_task
After commit f5d4e04634c9 ("nilfs2: fix use-after-free of timer for log writer thread") is applied, nilfs_construct_timeout(), which is called by a timer and wakes up the log writer thread, is never called after the log writer thread has terminated. As a result, the member variable "sc_timer_task" of the "nilfs_sc_info" structure, which was added when timer_setup() was adopted to retain a reference to the log writer thread's task even after it had terminated, is no longer needed, as it should be; we can simply use "sc_task" instead, which holds a reference to the log writer thread's task for its lifetime. So, eliminate "sc_timer_task" by this means. Link: https://lkml.kernel.org/r/20240826174116.5008-7-konishi.ryusuke@gmail.com Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Cc: Huang Xiaojia <huangxiaojia2@huawei.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'fs/nilfs2/segment.h')
-rw-r--r--fs/nilfs2/segment.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nilfs2/segment.h b/fs/nilfs2/segment.h
index 2499721ebcc9..7d1160a266df 100644
--- a/fs/nilfs2/segment.h
+++ b/fs/nilfs2/segment.h
@@ -115,7 +115,6 @@ struct nilfs_segsum_pointer {
* @sc_lseg_stime: Start time of the latest logical segment
* @sc_watermark: Watermark for the number of dirty buffers
* @sc_timer: Timer for segctord
- * @sc_timer_task: Thread woken up by @sc_timer
* @sc_task: current thread of segctord
*/
struct nilfs_sc_info {
@@ -172,7 +171,6 @@ struct nilfs_sc_info {
unsigned long sc_watermark;
struct timer_list sc_timer;
- struct task_struct *sc_timer_task;
struct task_struct *sc_task;
};