summaryrefslogtreecommitdiffstats
path: root/fs/nilfs2/segment.h
diff options
context:
space:
mode:
authorLi Hong <lihong.hi@gmail.com>2010-04-10 17:25:39 +0200
committerRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>2010-05-10 04:32:31 +0200
commitfdce895ea5dd4e24edf1f4d693827349a4e5b3b4 (patch)
tree77a1a4cd496ed8459813eddf68efe8b777c3c058 /fs/nilfs2/segment.h
parentnilfs2: remove nilfs_segctor_init() in segment.c (diff)
downloadlinux-fdce895ea5dd4e24edf1f4d693827349a4e5b3b4.tar.xz
linux-fdce895ea5dd4e24edf1f4d693827349a4e5b3b4.zip
nilfs2: change sc_timer from a pointer to an embedded one in struct nilfs_sc_info
In nilfs_segctor_thread(), timer is a local variable allocated on stack. Its address can't be set to sci->sc_timer and passed in several procedures. It works now by chance, just because other procedures are called by nilfs_segctor_thread() directly or indirectly and the stack hasn't been deallocated yet. Signed-off-by: Li Hong <lihong.hi@gmail.com> Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Diffstat (limited to 'fs/nilfs2/segment.h')
-rw-r--r--fs/nilfs2/segment.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/segment.h b/fs/nilfs2/segment.h
index 7aca76532683..dca142361ccf 100644
--- a/fs/nilfs2/segment.h
+++ b/fs/nilfs2/segment.h
@@ -177,7 +177,7 @@ struct nilfs_sc_info {
unsigned long sc_lseg_stime; /* in 1/HZ seconds */
unsigned long sc_watermark;
- struct timer_list *sc_timer;
+ struct timer_list sc_timer;
struct task_struct *sc_task;
};