register JBD2 in fs/Kconfig. Signed-off-By: Randy Dunlap Signed-Off-By: Mingming Cao --- linux-2.6.18-rc6-ming/fs/Kconfig | 34 ++++++++++++++++++++++++++++++++- linux-2.6.18-rc6-ming/fs/Makefile | 1 linux-2.6.18-rc6-ming/fs/jbd2/Makefile | 4 +-- 3 files changed, 36 insertions(+), 3 deletions(-) diff -puN fs/jbd2/Makefile~register-jbd2 fs/jbd2/Makefile --- linux-2.6.18-rc6/fs/jbd2/Makefile~register-jbd2 2006-09-07 23:05:07.967759765 -0700 +++ linux-2.6.18-rc6-ming/fs/jbd2/Makefile 2006-09-07 23:05:07.976758661 -0700 @@ -2,6 +2,6 @@ # Makefile for the linux journaling routines. # -obj-$(CONFIG_JBD) += jbd.o +obj-$(CONFIG_JBD2) += jbd2.o -jbd-objs := transaction.o commit.o recovery.o checkpoint.o revoke.o journal.o +jbd2-objs := transaction.o commit.o recovery.o checkpoint.o revoke.o journal.o diff -puN fs/Kconfig~register-jbd2 fs/Kconfig --- linux-2.6.18-rc6/fs/Kconfig~register-jbd2 2006-09-07 23:05:07.971759275 -0700 +++ linux-2.6.18-rc6-ming/fs/Kconfig 2006-09-07 23:05:07.980758171 -0700 @@ -141,7 +141,7 @@ config EXT3_FS_SECURITY config EXT4DEV_FS tristate "Ext4dev/ext4 extended fs support development (EXPERIMENTAL)" depends on EXPERIMENTAL - select JBD + select JBD2 help Ext4dev is a predecessor filesystem of the next generation extended fs ext4, based on ext3 filesystem code. It will be @@ -237,6 +237,38 @@ config JBD_DEBUG generated. To turn debugging off again, do "echo 0 > /proc/sys/fs/jbd-debug". +config JBD2 + tristate + 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 + the ext4dev/ext4 filesystem, but it could also be used to add + journal support to other file systems or block devices such + as RAID or LVM. + + If you are using ext4dev/ext4, you need to say Y here. If you are not + using ext4dev/ext4 then you will probably want to say N. + + To compile this device as a module, choose M here. The module will be + called jbd2. If you are compiling ext4dev/ext4 into the kernel, + you cannot compile this code as a module. + +config JBD2_DEBUG + bool "JBD2 (ext4dev/ext4) debugging support" + depends on JBD2 + help + If you are using the ext4dev/ext4 journaled file system (or + potentially any other filesystem/device using JBD2), this option + allows you to enable debugging output while the system is running, + in order to help track down any problems you are having. + By default, the debugging output will be turned off. + + If you select Y here, then you will be able to turn on debugging + with "echo N > /proc/sys/fs/jbd2-debug", where N is a number between + 1 and 5. The higher the number, the more debugging output is + generated. To turn debugging off again, do + "echo 0 > /proc/sys/fs/jbd2-debug". + config FS_MBCACHE # Meta block cache for Extended Attributes (ext2/ext3/ext4) tristate diff -puN fs/Makefile~register-jbd2 fs/Makefile --- linux-2.6.18-rc6/fs/Makefile~register-jbd2 2006-09-07 23:05:07.974758907 -0700 +++ linux-2.6.18-rc6-ming/fs/Makefile 2006-09-07 23:05:07.981758048 -0700 @@ -56,6 +56,7 @@ obj-$(CONFIG_REISERFS_FS) += reiserfs/ obj-$(CONFIG_EXT3_FS) += ext3/ # Before ext2 so root fs can be ext3 obj-$(CONFIG_EXT4DEV_FS) += ext4/ # Before ext2 so root fs can be ext4dev obj-$(CONFIG_JBD) += jbd/ +obj-$(CONFIG_JBD2) += jbd2/ obj-$(CONFIG_EXT2_FS) += ext2/ obj-$(CONFIG_CRAMFS) += cramfs/ obj-$(CONFIG_RAMFS) += ramfs/ _