dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Revert "task_struct: make journal_info conditional" 

This reverts commit e4c570c4cb, 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>
This commit is contained in:
Linus Torvalds 2009-12-17 13:23:24 -08:00
parent a2770d86b3
commit b6e3224fb2
10 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/Kconfig
View File

@ -6,10 +6,6 @@ menu "File systems"
if BLOCK
config FS_JOURNAL_INFO
bool
default n
source "fs/ext2/Kconfig"
source "fs/ext3/Kconfig"
source "fs/ext4/Kconfig"

1
fs/btrfs/Kconfig
View File

@ -4,7 +4,6 @@ config BTRFS_FS
select LIBCRC32C
select ZLIB_INFLATE
select ZLIB_DEFLATE
select FS_JOURNAL_INFO
help
Btrfs is a new filesystem with extents, writable snapshotting,
support for multiple devices and many more features.

1
fs/ext4/Kconfig
View File

@ -2,7 +2,6 @@ config EXT4_FS
tristate "The Extended 4 (ext4) filesystem"
select JBD2
select CRC16
select FS_JOURNAL_INFO
help
This is the next generation of the ext3 filesystem.

1
fs/gfs2/Kconfig
View File

@ -10,7 +10,6 @@ config GFS2_FS
select SLOW_WORK
select QUOTA
select QUOTACTL
select FS_JOURNAL_INFO
help
A cluster filesystem.

1
fs/jbd/Kconfig
View File

@ -1,6 +1,5 @@
config JBD
tristate
select FS_JOURNAL_INFO
help
This is a generic journalling layer for block devices. It is
currently used by the ext3 file system, but it could also be

1
fs/jbd2/Kconfig
View File

@ -1,7 +1,6 @@
config JBD2
tristate
select CRC32
select FS_JOURNAL_INFO
help
This is a generic journaling layer for block devices that support
both 32-bit and 64-bit block numbers. It is currently used by

1
fs/nilfs2/Kconfig
View File

@ -2,7 +2,6 @@ config NILFS2_FS
tristate "NILFS2 file system support (EXPERIMENTAL)"
depends on EXPERIMENTAL
select CRC32
select FS_JOURNAL_INFO
help
NILFS2 is a log-structured file system (LFS) supporting continuous
snapshotting. In addition to versioning capability of the entire

1
fs/reiserfs/Kconfig
View File

@ -1,7 +1,6 @@
config REISERFS_FS
tristate "Reiserfs support"
select CRC32
select FS_JOURNAL_INFO
help
Stores not just filenames but the files themselves in a balanced
tree. Uses journalling.

8
include/linux/init_task.h
View File

@ -111,12 +111,6 @@ extern struct cred init_cred;
# define INIT_PERF_EVENTS(tsk)
#endif
#ifdef CONFIG_FS_JOURNAL_INFO
#define INIT_JOURNAL_INFO .journal_info = NULL,
#else
#define INIT_JOURNAL_INFO
#endif
/*
* INIT_TASK is used to set up the first task table, touch at
* your own risk!. Base=0, limit=0x1fffff (=2MB)
@ -168,6 +162,7 @@ extern struct cred init_cred;
.signal = {{0}}}, \
.blocked = {{0}}, \
.alloc_lock = __SPIN_LOCK_UNLOCKED(tsk.alloc_lock), \
.journal_info = NULL, \
.cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \
.fs_excl = ATOMIC_INIT(0), \
.pi_lock = __RAW_SPIN_LOCK_UNLOCKED(tsk.pi_lock), \
@ -178,7 +173,6 @@ extern struct cred init_cred;
[PIDTYPE_SID] = INIT_PID_LINK(PIDTYPE_SID), \
}, \
.dirties = INIT_PROP_LOCAL_SINGLE(dirties), \
INIT_JOURNAL_INFO \
INIT_IDS \
INIT_PERF_EVENTS(tsk) \
INIT_TRACE_IRQFLAGS \

2
include/linux/sched.h
View File

@ -1446,10 +1446,8 @@ struct task_struct {
gfp_t lockdep_reclaim_gfp;
#endif
#ifdef CONFIG_FS_JOURNAL_INFO
/* journalling filesystem info */
void *journal_info;
#endif
/* stacked block device info */
struct bio *bio_list, **bio_tail;