LU-16138 kernel: preserve RHEL8.x server kABI for block integrity

[fs/lustre-release.git] / lustre / kernel_patches / patches / block-pass-bio-into-integrity_processing_fn-rhel8.patch

diff --git a/lustre/kernel_patches/patches/block-pass-bio-into-integrity_processing_fn-rhel8.patch b/lustre/kernel_patches/patches/block-pass-bio-into-integrity_processing_fn-rhel8.patch
index b5864b7..44c97e7 100644 (file)
--- a/lustre/kernel_patches/patches/block-pass-bio-into-integrity_processing_fn-rhel8.patch
+++ b/lustre/kernel_patches/patches/block-pass-bio-into-integrity_processing_fn-rhel8.patch
@@ -36,17 +36,17 @@ Index: linux-4.18.0/block/bio-integrity.c
        }
        return ret;
  }
-Index: linux-4.18.0/include/linux/blkdev.h
+Index: linux-4.18.0-372.19.1.el8_6/include/linux/blkdev.h
 ===================================================================
---- linux-4.18.0.orig/include/linux/blkdev.h
-+++ linux-4.18.0/include/linux/blkdev.h
-@@ -1802,7 +1802,9 @@ struct blk_integrity_iter {
+--- linux-4.18.0-372.19.1.el8_6.orig/include/linux/blkdev.h
++++ linux-4.18.0-372.19.1.el8_6/include/linux/blkdev.h
+@@ -1615,7 +1615,9 @@ struct blk_integrity_iter {
        sector_t                seed;
        unsigned int            data_size;
        unsigned short          interval;
-+      unsigned short          bi_idx;
++      RH_KABI_FILL_HOLE(unsigned short bi_idx)
        const char              *disk_name;
-+      struct bio              *bio;
++      RH_KABI_EXTEND(struct bio *bio)
  };
  
  typedef blk_status_t (integrity_processing_fn) (struct blk_integrity_iter *);