Commit b6e3224f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "task_struct: make journal_info conditional" 



This reverts commit e4c570c4, 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: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a2770d86

fs/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -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"

fs/btrfs/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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.

fs/ext4/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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.

fs/gfs2/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ config GFS2_FS 
	select SLOW_WORK

	select QUOTA

	select QUOTACTL

	select FS_JOURNAL_INFO

	help

	  A cluster filesystem.

fs/jbd/Kconfig

+0 −1
Original line number Diff line number Diff line 
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

CRA Git | Maintained and supported by SUSTech CRA and CCSE