From: Greg Kroah-Hartman Date: Mon, 17 Feb 2020 19:48:05 +0000 (+0100) Subject: fix up ext4 and btrfs patch on older kernels X-Git-Tag: v4.19.105~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7537803f0fe22fcaf391e81293263759ef06de49;p=thirdparty%2Fkernel%2Fstable-queue.git fix up ext4 and btrfs patch on older kernels --- diff --git a/queue-4.14/ext4-fix-checksum-errors-with-indexed-dirs.patch b/queue-4.14/ext4-fix-checksum-errors-with-indexed-dirs.patch index c016fd49890..6e11883be9f 100644 --- a/queue-4.14/ext4-fix-checksum-errors-with-indexed-dirs.patch +++ b/queue-4.14/ext4-fix-checksum-errors-with-indexed-dirs.patch @@ -99,8 +99,8 @@ Signed-off-by: Greg Kroah-Hartman + */ + if (!ext4_has_feature_dir_index(sb) && ext4_has_metadata_csum(sb) && + ext4_test_inode_flag(inode, EXT4_INODE_INDEX)) { -+ ext4_error_inode(inode, function, line, 0, -+ "iget: Dir with htree data on filesystem without dir_index feature."); ++ EXT4_ERROR_INODE(inode, ++ "iget: Dir with htree data on filesystem without dir_index feature."); + ret = -EFSCORRUPTED; + goto bad_inode; + } diff --git a/queue-4.4/ext4-fix-checksum-errors-with-indexed-dirs.patch b/queue-4.4/ext4-fix-checksum-errors-with-indexed-dirs.patch index c84fa818f01..727abb25db4 100644 --- a/queue-4.4/ext4-fix-checksum-errors-with-indexed-dirs.patch +++ b/queue-4.4/ext4-fix-checksum-errors-with-indexed-dirs.patch @@ -99,8 +99,8 @@ Signed-off-by: Greg Kroah-Hartman + */ + if (!ext4_has_feature_dir_index(sb) && ext4_has_metadata_csum(sb) && + ext4_test_inode_flag(inode, EXT4_INODE_INDEX)) { -+ ext4_error_inode(inode, function, line, 0, -+ "iget: Dir with htree data on filesystem without dir_index feature."); ++ EXT4_ERROR_INODE(inode, ++ "iget: Dir with htree data on filesystem without dir_index feature."); + ret = -EFSCORRUPTED; + goto bad_inode; + } diff --git a/queue-4.9/btrfs-fix-race-between-using-extent-maps-and-merging-them.patch b/queue-4.9/btrfs-fix-race-between-using-extent-maps-and-merging-them.patch index 804677192c3..7b9fc53842a 100644 --- a/queue-4.9/btrfs-fix-race-between-using-extent-maps-and-merging-them.patch +++ b/queue-4.9/btrfs-fix-race-between-using-extent-maps-and-merging-them.patch @@ -120,7 +120,7 @@ Signed-off-by: Greg Kroah-Hartman + * clearing the logging flag), so anything > 2 means it's being used by + * other tasks too. + */ -+ if (refcount_read(&em->refs) > 2) ++ if (atomic_read(&em->refs) > 2) + return; + if (em->start != 0) { diff --git a/queue-4.9/ext4-fix-checksum-errors-with-indexed-dirs.patch b/queue-4.9/ext4-fix-checksum-errors-with-indexed-dirs.patch index f8cbd60d5cc..5db3c0cb40c 100644 --- a/queue-4.9/ext4-fix-checksum-errors-with-indexed-dirs.patch +++ b/queue-4.9/ext4-fix-checksum-errors-with-indexed-dirs.patch @@ -99,8 +99,8 @@ Signed-off-by: Greg Kroah-Hartman + */ + if (!ext4_has_feature_dir_index(sb) && ext4_has_metadata_csum(sb) && + ext4_test_inode_flag(inode, EXT4_INODE_INDEX)) { -+ ext4_error_inode(inode, function, line, 0, -+ "iget: Dir with htree data on filesystem without dir_index feature."); ++ EXT4_ERROR_INODE(inode, ++ "iget: Dir with htree data on filesystem without dir_index feature."); + ret = -EFSCORRUPTED; + goto bad_inode; + }