diff --git a/ldiskfs/kernel_patches/patches/rhel7.6alt/ext4-corrupted-inode-block-bitmaps-handling-patches.patch b/ldiskfs/kernel_patches/patches/rhel7.6alt/ext4-corrupted-inode-bl index 9305cfe..2b90ce7 100644 --- a/ldiskfs/kernel_patches/patches/rhel7.6alt/ext4-corrupted-inode-block-bitmaps-handling-patches.patch +++ b/ldiskfs/kernel_patches/patches/rhel7.6alt/ext4-corrupted-inode-block-bitmaps-handling-patches.patch @@ -11,6 +11,7 @@ Index: linux-4.15.0/fs/ext4/balloc.c unsigned int bit, bit_max; struct ext4_sb_info *sbi = EXT4_SB(sb); ext4_fsblk_t start, tmp; + int flex_bg = 0; - struct ext4_group_info *grp; J_ASSERT_BH(bh, buffer_locked(bh)); diff --git a/ldiskfs/kernel_patches/patches/rhel7.6alt/ext4-data-in-dirent.patch b/ldiskfs/kernel_patches/patches/rhel7.6alt/ext4-data-in-dirent.patch index 2c47208..d983869 100644 --- a/ldiskfs/kernel_patches/patches/rhel7.6alt/ext4-data-in-dirent.patch +++ b/ldiskfs/kernel_patches/patches/rhel7.6alt/ext4-data-in-dirent.patch @@ -85,7 +85,10 @@ diff -ur linux-stage.orig/fs/ext4/ext4.h linux-stage/fs/ext4/ext4.h EXT4_FEATURE_INCOMPAT_FLEX_BG| \ EXT4_FEATURE_INCOMPAT_MMP | \ + EXT4_FEATURE_INCOMPAT_DIRDATA| \ - EXT4_FEATURE_INCOMPAT_INLINE_DATA) + EXT4_FEATURE_INCOMPAT_INLINE_DATA | \ + EXT4_FEATURE_INCOMPAT_ENCRYPT | \ + EXT4_FEATURE_INCOMPAT_CSUM_SEED | \ + EXT4_FEATURE_INCOMPAT_LARGEDIR) #define EXT4_FEATURE_RO_COMPAT_SUPP (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \ EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \ @@ -1979,6 +1982,43 @@ diff --git a/ldiskfs/kernel_patches/patches/rhel7.6alt/ext4-dont-check-before-replay.patch b/ldiskfs/kernel_patches/patches/rhel7.6alt/ext4-dont-check-before-replay.patch index c07ff44..1209a9d 100644 --- a/ldiskfs/kernel_patches/patches/rhel7.6alt/ext4-dont-check-before-replay.patch +++ b/ldiskfs/kernel_patches/patches/rhel7.6alt/ext4-dont-check-before-replay.patch @@ -8,18 +8,19 @@ Index: linux-4.15.0/fs/ext4/super.c =================================================================== --- linux-4.15.0.orig/fs/ext4/super.c --- linux-4.15.0.orig/fs/ext4/super.c +++ linux-4.15.0/fs/ext4/super.c -@@ -4040,11 +4040,6 @@ +@@ -4011,11 +4011,6 @@ + goto failed_mount2; } } - sbi->s_gdb_count = db_count; - if (!ext4_check_descriptors(sb, logical_sb_block, &first_not_zeroed)) { - ext4_msg(sb, KERN_ERR, "group descriptors corrupted!"); - ret = -EFSCORRUPTED; - goto failed_mount2; - } + sbi->s_gdb_count = db_count; get_random_bytes(&sbi->s_next_generation, sizeof(u32)); - spin_lock_init(&sbi->s_next_gen_lock); + @@ -4185,6 +4180,13 @@ sbi->s_journal->j_commit_callback = ext4_journal_commit_callback;