diff options
| -rw-r--r-- | include/kernel-version.mk | 4 | ||||
| -rw-r--r-- | target/linux/generic/backport-4.9/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch | 65 |
2 files changed, 2 insertions, 67 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 008e9c572f..a74892113d 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,11 +3,11 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .71 -LINUX_VERSION-4.9 = .119 +LINUX_VERSION-4.9 = .120 LINUX_VERSION-4.14 = .63 LINUX_KERNEL_HASH-3.18.71 = 5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240 -LINUX_KERNEL_HASH-4.9.119 = 49e17f01a1a607b4b1ab28dc7177e103943151866c3956fd83edc8a4aae60b35 +LINUX_KERNEL_HASH-4.9.120 = d75af506865edc8145a344c4e73c3bb1000e6c9f1c3489b8dae47ca8f033fd91 LINUX_KERNEL_HASH-4.14.63 = cd2e52f0e7ba861afa91cf487b2f45e5174115870f256a1d65996647b7bcc6d3 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) diff --git a/target/linux/generic/backport-4.9/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch b/target/linux/generic/backport-4.9/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch deleted file mode 100644 index 914dddf726..0000000000 --- a/target/linux/generic/backport-4.9/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 5012284700775a4e6e3fbe7eac4c543c4874b559 Mon Sep 17 00:00:00 2001 -From: Theodore Ts'o <tytso@mit.edu> -Date: Sat, 28 Jul 2018 08:12:04 -0400 -Subject: [PATCH] ext4: fix check to prevent initializing reserved inodes - -Commit 8844618d8aa7: "ext4: only look at the bg_flags field if it is -valid" will complain if block group zero does not have the -EXT4_BG_INODE_ZEROED flag set. Unfortunately, this is not correct, -since a freshly created file system has this flag cleared. It gets -almost immediately after the file system is mounted read-write --- but -the following somewhat unlikely sequence will end up triggering a -false positive report of a corrupted file system: - - mkfs.ext4 /dev/vdc - mount -o ro /dev/vdc /vdc - mount -o remount,rw /dev/vdc - -Instead, when initializing the inode table for block group zero, test -to make sure that itable_unused count is not too large, since that is -the case that will result in some or all of the reserved inodes -getting cleared. - -This fixes the failures reported by Eric Whiteney when running -generic/230 and generic/231 in the the nojournal test case. - -Fixes: 8844618d8aa7 ("ext4: only look at the bg_flags field if it is valid") -Reported-by: Eric Whitney <enwlinux@gmail.com> -Signed-off-by: Theodore Ts'o <tytso@mit.edu> ---- - fs/ext4/ialloc.c | 5 ++++- - fs/ext4/super.c | 8 +------- - 2 files changed, 5 insertions(+), 8 deletions(-) - ---- a/fs/ext4/ialloc.c -+++ b/fs/ext4/ialloc.c -@@ -1316,7 +1316,10 @@ int ext4_init_inode_table(struct super_b - ext4_itable_unused_count(sb, gdp)), - sbi->s_inodes_per_block); - -- if ((used_blks < 0) || (used_blks > sbi->s_itb_per_group)) { -+ if ((used_blks < 0) || (used_blks > sbi->s_itb_per_group) || -+ ((group == 0) && ((EXT4_INODES_PER_GROUP(sb) - -+ ext4_itable_unused_count(sb, gdp)) < -+ EXT4_FIRST_INO(sb)))) { - ext4_error(sb, "Something is wrong with group %u: " - "used itable blocks: %d; " - "itable unused count: %u", ---- a/fs/ext4/super.c -+++ b/fs/ext4/super.c -@@ -3031,14 +3031,8 @@ static ext4_group_t ext4_has_uninit_itab - if (!gdp) - continue; - -- if (gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_ZEROED)) -- continue; -- if (group != 0) -+ if (!(gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_ZEROED))) - break; -- ext4_error(sb, "Inode table for bg 0 marked as " -- "needing zeroing"); -- if (sb->s_flags & MS_RDONLY) -- return ngroups; - } - - return group; |