diff options
author | Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | 2009-12-14 21:00:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 11:53:27 -0500 |
commit | e4c570c4cb7a95dbfafa3d016d2739bf3fdfe319 (patch) | |
tree | ce2be0a79fa2e8d8271426f0fc27b25e83c050b4 /include | |
parent | 8420e7efa1cf155765c6d77c91d3e3547c7aa557 (diff) |
task_struct: make journal_info conditional
journal_info in task_struct is used in journaling file system only. So
introduce CONFIG_FS_JOURNAL_INFO and make it conditional.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: KONISHI Ryusuke <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 'include')
-rw-r--r-- | include/linux/init_task.h | 8 | ||||
-rw-r--r-- | include/linux/sched.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 8d10aa7fd4c9..8ed0abf06f89 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
@@ -111,6 +111,12 @@ extern struct cred init_cred; | |||
111 | # define INIT_PERF_EVENTS(tsk) | 111 | # define INIT_PERF_EVENTS(tsk) |
112 | #endif | 112 | #endif |
113 | 113 | ||
114 | #ifdef CONFIG_FS_JOURNAL_INFO | ||
115 | #define INIT_JOURNAL_INFO .journal_info = NULL, | ||
116 | #else | ||
117 | #define INIT_JOURNAL_INFO | ||
118 | #endif | ||
119 | |||
114 | /* | 120 | /* |
115 | * INIT_TASK is used to set up the first task table, touch at | 121 | * INIT_TASK is used to set up the first task table, touch at |
116 | * your own risk!. Base=0, limit=0x1fffff (=2MB) | 122 | * your own risk!. Base=0, limit=0x1fffff (=2MB) |
@@ -162,7 +168,6 @@ extern struct cred init_cred; | |||
162 | .signal = {{0}}}, \ | 168 | .signal = {{0}}}, \ |
163 | .blocked = {{0}}, \ | 169 | .blocked = {{0}}, \ |
164 | .alloc_lock = __SPIN_LOCK_UNLOCKED(tsk.alloc_lock), \ | 170 | .alloc_lock = __SPIN_LOCK_UNLOCKED(tsk.alloc_lock), \ |
165 | .journal_info = NULL, \ | ||
166 | .cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \ | 171 | .cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \ |
167 | .fs_excl = ATOMIC_INIT(0), \ | 172 | .fs_excl = ATOMIC_INIT(0), \ |
168 | .pi_lock = __SPIN_LOCK_UNLOCKED(tsk.pi_lock), \ | 173 | .pi_lock = __SPIN_LOCK_UNLOCKED(tsk.pi_lock), \ |
@@ -173,6 +178,7 @@ extern struct cred init_cred; | |||
173 | [PIDTYPE_SID] = INIT_PID_LINK(PIDTYPE_SID), \ | 178 | [PIDTYPE_SID] = INIT_PID_LINK(PIDTYPE_SID), \ |
174 | }, \ | 179 | }, \ |
175 | .dirties = INIT_PROP_LOCAL_SINGLE(dirties), \ | 180 | .dirties = INIT_PROP_LOCAL_SINGLE(dirties), \ |
181 | INIT_JOURNAL_INFO \ | ||
176 | INIT_IDS \ | 182 | INIT_IDS \ |
177 | INIT_PERF_EVENTS(tsk) \ | 183 | INIT_PERF_EVENTS(tsk) \ |
178 | INIT_TRACE_IRQFLAGS \ | 184 | INIT_TRACE_IRQFLAGS \ |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 294eb2f80144..7d388494f45d 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1446,8 +1446,10 @@ struct task_struct { | |||
1446 | gfp_t lockdep_reclaim_gfp; | 1446 | gfp_t lockdep_reclaim_gfp; |
1447 | #endif | 1447 | #endif |
1448 | 1448 | ||
1449 | #ifdef CONFIG_FS_JOURNAL_INFO | ||
1449 | /* journalling filesystem info */ | 1450 | /* journalling filesystem info */ |
1450 | void *journal_info; | 1451 | void *journal_info; |
1452 | #endif | ||
1451 | 1453 | ||
1452 | /* stacked block device info */ | 1454 | /* stacked block device info */ |
1453 | struct bio *bio_list, **bio_tail; | 1455 | struct bio *bio_list, **bio_tail; |