Version 8.2.5.10

- Adapted to backported kernel changes.
- Removed unused (and incorrect) variables from dkms configuration.
- Simplified kernel version build support.

kvdo.spec

@@ -1,6 +1,6 @@
 %define spec_release 1
 %define kmod_name		kvdo
-%define kmod_driver_version	8.2.5.2
+%define kmod_driver_version	8.2.5.10
 %define kmod_rpm_release	%{spec_release}
 %define kmod_kernel_version	3.10.0-693.el7
 
@@ -81,8 +81,6 @@ AUTOINSTALL="yes"
 BUILT_MODULE_NAME[0]="kvdo"
 BUILT_MODULE_LOCATION[0]="vdo"
 DEST_MODULE_LOCATION[0]="/kernel/drivers/block/"
-BUILD_DEPENDS[0]=LZ4_COMPRESS
-BUILD_DEPENDS[0]=LZ4_DECOMPRESS
 STRIP[0]="no"
 EOF
 
@@ -94,5 +92,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_usr}/src/%{kmod_name}-%{version}
 
 %changelog
-* Tue Nov 05 2024 - Red Hat VDO Team <[email protected]> - 8.2.5.2-1
+* Thu Jan 23 2025 - Red Hat VDO Team <[email protected]> - 8.2.5.10-1
 - See https://github.com/dm-vdo/kvdo.git

vdo/Makefile

@@ -1,4 +1,4 @@
-VDO_VERSION = 8.2.5.2
+VDO_VERSION = 8.2.5.10
 
 SOURCES  = $(notdir $(wildcard $(src)/*.c))
 OBJECTS = $(SOURCES:%.c=%.o)

vdo/dm-vdo-target.c

@@ -73,9 +73,9 @@ static void vdo_io_hints(struct dm_target *ti, struct queue_limits *limits)
 	limits->physical_block_size = VDO_BLOCK_SIZE;
 
 	/* The minimum io size for random io */
-	blk_limits_io_min(limits, VDO_BLOCK_SIZE);
+	limits->io_min = VDO_BLOCK_SIZE;
 	/* The optimal io size for streamed/sequential io */
-	blk_limits_io_opt(limits, VDO_BLOCK_SIZE);
+	limits->io_opt = VDO_BLOCK_SIZE;
 
 	/*
 	 * Sets the maximum discard size that will be passed into VDO. This
@@ -96,8 +96,7 @@ static void vdo_io_hints(struct dm_target *ti, struct queue_limits *limits)
 	 */
 #ifndef VDO_UPSTREAM
 #undef VDO_USE_ALTERNATE
-#if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(9, 6)) || \
-    ((RHEL_RELEASE_CODE == RHEL_RELEASE_VERSION(9, 6)) && (RHEL_RELEASE_EXTRA < 522))
+#if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(9, 6))
 #define VDO_USE_ALTERNATE
 #endif /* RHEL_RELEASE_CODE */
 #endif /* VDO_UPSTREAM */

vdo/io-factory.c

@@ -18,8 +18,7 @@
 #undef VDO_USE_ALTERNATE_2
 #undef VDO_USE_ALTERNATE_3
 #ifdef RHEL_RELEASE_CODE
-#if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(9, 5)) || \
-    ((RHEL_RELEASE_CODE == RHEL_RELEASE_VERSION(9, 5)) && (RHEL_RELEASE_EXTRA < 446))
+#if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(9, 5))
 #define VDO_USE_ALTERNATE
 #define VDO_USE_ALTERNATE_2
 #if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(9, 4))