From 26837220d0ed48053ec972c42d318c44fe62da3a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 29 Jan 2021 19:48:31 +0100 Subject: [PATCH] - unify mbcache, raiserfs, jfs --- configs/kernel-apollo.config | 6 +++--- configs/kernel-hd5x.config | 2 ++ configs/kernel-hd6x.config | 15 ++++----------- configs/kernel-kronos.config | 6 +++--- configs/kernel-nevis.config | 2 ++ configs/kernel-vuduo.config | 8 ++++---- configs/kernel-vuduo4k.config | 7 ++----- configs/kernel-vuduo4kse.config | 5 +---- configs/kernel-vusolo4k.config | 8 ++------ configs/kernel-vuultimo4k.config | 2 +- configs/kernel-vuuno4k.config | 2 +- configs/kernel-vuuno4kse.config | 5 +---- configs/kernel-vuzero4k.config | 5 +---- 13 files changed, 27 insertions(+), 46 deletions(-) diff --git a/configs/kernel-apollo.config b/configs/kernel-apollo.config index 2255a209..3e6cecef 100644 --- a/configs/kernel-apollo.config +++ b/configs/kernel-apollo.config @@ -2234,11 +2234,11 @@ CONFIG_EXT4_FS=m # CONFIG_EXT4_FS_POSIX_ACL is not set # CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_DEBUG is not set -CONFIG_JBD=m +CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set -CONFIG_JBD2=m +CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=m +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_XFS_FS=m diff --git a/configs/kernel-hd5x.config b/configs/kernel-hd5x.config index 1a669110..9b33c32f 100644 --- a/configs/kernel-hd5x.config +++ b/configs/kernel-hd5x.config @@ -3768,6 +3768,8 @@ CONFIG_EXT4_FS=y # CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_ENCRYPTION is not set # CONFIG_EXT4_DEBUG is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y diff --git a/configs/kernel-hd6x.config b/configs/kernel-hd6x.config index 1ab7c6b7..c6ae7a60 100644 --- a/configs/kernel-hd6x.config +++ b/configs/kernel-hd6x.config @@ -3866,20 +3866,13 @@ CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_ENCRYPTION is not set # CONFIG_EXT4_DEBUG is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=m -CONFIG_REISERFS_CHECK=y -CONFIG_REISERFS_PROC_INFO=y -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y -CONFIG_JFS_DEBUG=y -CONFIG_JFS_STATISTICS=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set CONFIG_XFS_FS=m # CONFIG_XFS_QUOTA is not set CONFIG_XFS_POSIX_ACL=y diff --git a/configs/kernel-kronos.config b/configs/kernel-kronos.config index d753acc4..9ea24517 100644 --- a/configs/kernel-kronos.config +++ b/configs/kernel-kronos.config @@ -2179,11 +2179,11 @@ CONFIG_EXT4_FS=m # CONFIG_EXT4_FS_POSIX_ACL is not set # CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_DEBUG is not set -CONFIG_JBD=m +CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set -CONFIG_JBD2=m +CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=m +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_XFS_FS=m diff --git a/configs/kernel-nevis.config b/configs/kernel-nevis.config index 894098cd..0b7c6580 100644 --- a/configs/kernel-nevis.config +++ b/configs/kernel-nevis.config @@ -1418,7 +1418,9 @@ CONFIG_EXT4_FS_XATTR=y # CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_DEBUG is not set CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set diff --git a/configs/kernel-vuduo.config b/configs/kernel-vuduo.config index 1d18d405..faa1c9a9 100644 --- a/configs/kernel-vuduo.config +++ b/configs/kernel-vuduo.config @@ -2687,12 +2687,12 @@ CONFIG_EXT4_USE_FOR_EXT23=y # CONFIG_EXT4_FS_POSIX_ACL is not set # CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_DEBUG is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -# CONFIG_REISERFS_FS_XATTR is not set +# CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_XFS_FS=m # CONFIG_XFS_QUOTA is not set diff --git a/configs/kernel-vuduo4k.config b/configs/kernel-vuduo4k.config index 2ecd903c..773a0712 100644 --- a/configs/kernel-vuduo4k.config +++ b/configs/kernel-vuduo4k.config @@ -3612,15 +3612,12 @@ CONFIG_EXT4_FS=y # CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_ENCRYPTION is not set # CONFIG_EXT4_DEBUG is not set -CONFIG_JBD=m +CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -# CONFIG_REISERFS_FS_XATTR is not set +# CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_XFS_FS=m # CONFIG_XFS_QUOTA is not set diff --git a/configs/kernel-vuduo4kse.config b/configs/kernel-vuduo4kse.config index c6837875..f9d45a42 100644 --- a/configs/kernel-vuduo4kse.config +++ b/configs/kernel-vuduo4kse.config @@ -3569,10 +3569,7 @@ CONFIG_JBD=y CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -# CONFIG_REISERFS_FS_XATTR is not set +# CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_XFS_FS=m # CONFIG_XFS_QUOTA is not set diff --git a/configs/kernel-vusolo4k.config b/configs/kernel-vusolo4k.config index d4859165..4bf6b707 100644 --- a/configs/kernel-vusolo4k.config +++ b/configs/kernel-vusolo4k.config @@ -3453,17 +3453,13 @@ CONFIG_EXT4_FS=y # CONFIG_EXT4_FS_POSIX_ACL is not set # CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_DEBUG is not set -CONFIG_JBD=m +CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set -CONFIG_JFS_FS=y -# CONFIG_JFS_POSIX_ACL is not set -# CONFIG_JFS_SECURITY is not set -# CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set +# CONFIG_JFS_FS is not set CONFIG_XFS_FS=m # CONFIG_XFS_QUOTA is not set CONFIG_XFS_POSIX_ACL=y diff --git a/configs/kernel-vuultimo4k.config b/configs/kernel-vuultimo4k.config index d80e86f4..874ebe59 100644 --- a/configs/kernel-vuultimo4k.config +++ b/configs/kernel-vuultimo4k.config @@ -3301,7 +3301,7 @@ CONFIG_EXT4_FS=y # CONFIG_EXT4_FS_POSIX_ACL is not set # CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_DEBUG is not set -CONFIG_JBD=m +CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set diff --git a/configs/kernel-vuuno4k.config b/configs/kernel-vuuno4k.config index 2475c71f..9d94091d 100644 --- a/configs/kernel-vuuno4k.config +++ b/configs/kernel-vuuno4k.config @@ -3500,7 +3500,7 @@ CONFIG_EXT4_FS=y # CONFIG_EXT4_FS_POSIX_ACL is not set # CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_DEBUG is not set -CONFIG_JBD=m +CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set diff --git a/configs/kernel-vuuno4kse.config b/configs/kernel-vuuno4kse.config index 5865ce1c..7f733918 100644 --- a/configs/kernel-vuuno4kse.config +++ b/configs/kernel-vuuno4kse.config @@ -3679,10 +3679,7 @@ CONFIG_JBD=y CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -# CONFIG_REISERFS_FS_XATTR is not set +# CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_XFS_FS=m # CONFIG_XFS_QUOTA is not set diff --git a/configs/kernel-vuzero4k.config b/configs/kernel-vuzero4k.config index 1dd6952d..642f8259 100644 --- a/configs/kernel-vuzero4k.config +++ b/configs/kernel-vuzero4k.config @@ -3679,10 +3679,7 @@ CONFIG_JBD=y CONFIG_JBD2=y # CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -# CONFIG_REISERFS_FS_XATTR is not set +# CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_XFS_FS=m # CONFIG_XFS_QUOTA is not set