Version 8.2.1.2

- Adapted to backported kernel changes.
dm-vdo · Nov 9, 2022 · 883a960 · 883a960
1 parent b084c09
commit 883a960
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/kvdo.spec b/kvdo.spec
@@ -1,6 +1,6 @@
 %define spec_release 1
 %define kmod_name		kvdo
-%define kmod_driver_version	8.2.0.21
+%define kmod_driver_version	8.2.1.2
 %define kmod_rpm_release	%{spec_release}
 %define kmod_kernel_version	3.10.0-693.el7
 
@@ -94,5 +94,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_usr}/src/%{kmod_name}-%{version}
 
 %changelog
-* Thu Sep 22 2022 - Red Hat VDO Team <vdo-devel@redhat.com> - 8.2.0.21-1
+* Thu Nov 03 2022 - Red Hat VDO Team <vdo-devel@redhat.com> - 8.2.1.2-1
 - See https://github.com/dm-vdo/kvdo.git
diff --git a/vdo/Makefile b/vdo/Makefile
@@ -1,4 +1,4 @@
-VDO_VERSION = 8.2.0.21
+VDO_VERSION = 8.2.1.2
 
 SOURCES  = $(notdir $(wildcard $(src)/*.c))
 OBJECTS = $(SOURCES:%.c=%.o)

diff --git a/vdo/dm-vdo-target.c b/vdo/dm-vdo-target.c
@@ -129,7 +129,6 @@ static void vdo_status(struct dm_target *ti,
 	struct vdo *vdo = get_vdo_for_target(ti);
 	struct vdo_statistics *stats;
 	struct device_config *device_config;
-	char name_buffer[BDEVNAME_SIZE];
 	/*
 	 * N.B.: The DMEMIT macro uses the variables named "sz", "result",
 	 * "maxlen".
@@ -143,8 +142,8 @@ static void vdo_status(struct dm_target *ti,
 		vdo_fetch_statistics(vdo, &vdo->stats_buffer);
 		stats = &vdo->stats_buffer;
 
-		DMEMIT("/dev/%s %s %s %s %s %llu %llu",
-		       bdevname(vdo_get_backing_device(vdo), name_buffer),
+		DMEMIT("/dev/%pg %s %s %s %s %llu %llu",
+		       vdo_get_backing_device(vdo),
 		       stats->mode,
 		       stats->in_recovery_mode ? "recovering" : "-",
 		       vdo_get_dedupe_index_state_name(vdo->hash_zones),

diff --git a/vdo/io-factory.c b/vdo/io-factory.c
@@ -120,8 +120,13 @@ int make_uds_bufio(struct io_factory *factory,
 			UDS_BLOCK_SIZE);
 	}
 
+#ifdef DM_BUFIO_CLIENT_NO_SLEEP
+	client = dm_bufio_client_create(
+		factory->bdev, block_size, reserved_buffers, 0, NULL, NULL, 0);
+#else
 	client = dm_bufio_client_create(
 		factory->bdev, block_size, reserved_buffers, 0, NULL, NULL);
+#endif
 	if (IS_ERR(client)) {
 		return -PTR_ERR(client);
 	}

diff --git a/vdo/random.h b/vdo/random.h
@@ -35,7 +35,7 @@ void random_compile_time_assertions(void);
  **/
 static INLINE void fill_randomly(void *ptr, size_t len)
 {
-	prandom_bytes(ptr, len);
+	get_random_bytes(ptr, len);
 }
 
 #define RAND_MAX 2147483647