Version 8.3.0.73

- Fix unterminated string initialization. - Minor file reorganization. Signed-off-by: Matthew Sakai <[email protected]>
dm-vdo · Jan 29, 2025 · 0d72b56 · 0d72b56
1 parent 64786b7
commit 0d72b56
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 11 deletions.
diff --git a/utils/uds/Makefile b/utils/uds/Makefile
@@ -17,7 +17,7 @@
 # 02110-1301, USA.
 #
 
-BUILD_VERSION = 8.3.0.72
+BUILD_VERSION = 8.3.0.73
 
 DEPDIR = .deps
 

diff --git a/utils/uds/index-layout.c b/utils/uds/index-layout.c
@@ -54,7 +54,6 @@
  * Each save also has a unique nonce.
  */
 
-#define MAGIC_SIZE 32
 #define NONCE_INFO_SIZE 32
 #define MAX_SAVES 2
 
@@ -98,9 +97,11 @@ enum region_type {
 #define SUPER_VERSION_CURRENT 3
 #define SUPER_VERSION_MAXIMUM 7
 
-static const u8 LAYOUT_MAGIC[MAGIC_SIZE] = "*ALBIREO*SINGLE*FILE*LAYOUT*001*";
+static const u8 LAYOUT_MAGIC[] = "*ALBIREO*SINGLE*FILE*LAYOUT*001*";
 static const u64 REGION_MAGIC = 0x416c6252676e3031; /* 'AlbRgn01' */
 
+#define MAGIC_SIZE (sizeof(LAYOUT_MAGIC) - 1)
+
 struct region_header {
 	u64 magic;
 	u64 region_blocks;

diff --git a/utils/uds/asm/unaligned.h → utils/uds/linux/unaligned.h b/utils/uds/asm/unaligned.h → utils/uds/linux/unaligned.h
@@ -17,8 +17,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef ASM_UNALIGNED_H
-#define ASM_UNALIGNED_H
+#ifndef LINUX_UNALIGNED_H
+#define LINUX_UNALIGNED_H
 
 #include <asm/byteorder.h>
 #include <linux/types.h>
@@ -134,4 +134,4 @@ static inline void put_unaligned_be64(uint64_t val, void *p)
 	*((__be64 *)p) = __cpu_to_be64(val);
 }
 
-#endif /* ASM_UNALIGNED_H */
+#endif /* LINUX_UNALIGNED_H */
diff --git a/utils/uds/murmurhash3.c b/utils/uds/murmurhash3.c
@@ -8,7 +8,7 @@
 
 #include "murmurhash3.h"
 
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
 
 static inline u64 rotl64(u64 x, s8 r)
 {

diff --git a/utils/uds/numeric.h b/utils/uds/numeric.h
@@ -6,7 +6,7 @@
 #ifndef UDS_NUMERIC_H
 #define UDS_NUMERIC_H
 
-#include <asm/unaligned.h>
+#include <linux/unaligned.h>
 #include <linux/types.h>
 
 /*

diff --git a/utils/uds/time-utils.h b/utils/uds/time-utils.h
@@ -50,4 +50,9 @@ static inline s64 ktime_to_us(ktime_t reltime)
 	return reltime / NSEC_PER_USEC;
 }
 
+static inline ktime_t us_to_ktime(u64 microseconds)
+{
+	return (ktime_t) microseconds * NSEC_PER_USEC;
+}
+
 #endif /* UDS_TIME_UTILS_H */
diff --git a/utils/vdo/Makefile b/utils/vdo/Makefile
@@ -17,7 +17,7 @@
 # 02110-1301, USA.
 #
 
-VDO_VERSION = 8.3.0.72
+VDO_VERSION = 8.3.0.73
 
 UDS_DIR      = ../uds
 

diff --git a/vdo.spec b/vdo.spec
@@ -3,7 +3,7 @@
 
 Summary: Management tools for Virtual Data Optimizer
 Name: vdo
-Version: 8.3.0.72
+Version: 8.3.0.73
 Release: %{spec_release}%{?dist}
 
 License: GPL-2.0-only
@@ -98,5 +98,5 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALLOWNER= name=%{name} bindir=%{_bindir
 %{_mandir}/man8/vdorecover.8*
 
 %changelog
-* Tue Oct 15 2024 - Red Hat VDO Team <[email protected]> - 8.3.0.72-1
+* Tue Jan 28 2025 - Red Hat VDO Team <[email protected]> - 8.3.0.73-1
 - See https://github.com/dm-vdo/vdo.git