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 c016fd49890b04020a3fd8b4143515f6ed432ac2..6e11883be9f84072a9089db2c1cae9b1de5f61f5 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
 +       */
 +      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 c84fa818f0170b7a4e27d3b5f9de8283b48e2832..727abb25db41893d3f6b9551acc7dde2d03bdde5 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
 +       */
 +      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 804677192c391ceb9ba08ca01128efdab419b11e..7b9fc53842a2e0f57de7c12f4e14aea9fbaf1fd3 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
 +       * 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 f8cbd60d5cc524862d831b11d29bf94ecb085c7a..5db3c0cb40cb344ed1651fd0a5f8e6f29532d3c4 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
 +       */
 +      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;
 +      }