diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 16:23:24 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 16:23:24 -0500 |
commit | b6e3224fb20954f155e41ec5709b2ab70b50ae2d (patch) | |
tree | 96302d1b564c879779b9cc5d7aae7c3c4471ed14 /include/linux/sched.h | |
parent | a2770d86b33024f71df269fde2de096df89d6a48 (diff) |
Revert "task_struct: make journal_info conditional"
This reverts commit e4c570c4cb7a95dbfafa3d016d2739bf3fdfe319, as
requested by Alexey:
"I think I gave a good enough arguments to not merge it.
To iterate:
* patch makes impossible to start using ext3 on EXT3_FS=n kernels
without reboot.
* this is done only for one pointer on task_struct"
None of config options which define task_struct are tristate directly
or effectively."
Requested-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 244c287a5ac1..211ed32befbd 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1446,10 +1446,8 @@ 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 | ||
1450 | /* journalling filesystem info */ | 1449 | /* journalling filesystem info */ |
1451 | void *journal_info; | 1450 | void *journal_info; |
1452 | #endif | ||
1453 | 1451 | ||
1454 | /* stacked block device info */ | 1452 | /* stacked block device info */ |
1455 | struct bio *bio_list, **bio_tail; | 1453 | struct bio *bio_list, **bio_tail; |