diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 22:23:24 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-17 22:23:24 +0100 |
| commit | b6e3224fb20954f155e41ec5709b2ab70b50ae2d (patch) | |
| tree | 96302d1b564c879779b9cc5d7aae7c3c4471ed14 /fs/btrfs | |
| parent | Revert "fix mismerge with Trond's stuff (create_mnt_ns() export is gone now)" (diff) | |
| download | linux-b6e3224fb20954f155e41ec5709b2ab70b50ae2d.tar.xz linux-b6e3224fb20954f155e41ec5709b2ab70b50ae2d.zip | |
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 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig index 402afe0a0bfb..7bb3c020e570 100644 --- a/fs/btrfs/Kconfig +++ b/fs/btrfs/Kconfig @@ -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. |