diff --git a/kvdo.spec b/kvdo.spec
index b64f2925..f58b9971 100644
--- a/kvdo.spec
+++ b/kvdo.spec
@@ -1,6 +1,6 @@
 %define spec_release 1
 %define kmod_name		kvdo
-%define kmod_driver_version	8.1.0.316
+%define kmod_driver_version	8.1.1.287
 %define kmod_rpm_release	%{spec_release}
 %define kmod_kernel_version	3.10.0-693.el7
 
@@ -96,10 +96,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_usr}/src/%{kmod_name}-%{version}
 
 %changelog
-* Mon Aug 09 2021 - Red Hat VDO Team <vdo-devel@redhat.com> - 8.1.0.316-1
-- Rebased to upstream candidate.
-- Added support for vdo volumes which were created with the vdo script, but
-  have been converted to be managed by LVM.
-- Fixed GCC implicit-fallthrough errors when building for latest kernel.
-
-
+* Fri Jan 21 2022 - Red Hat VDO Team <vdo-devel@redhat.com> - 8.1.1.287-1
+- See https://github.com/dm-vdo/kvdo.git
diff --git a/uds/Makefile b/uds/Makefile
index 0500c7ad..d291fcc5 100644
--- a/uds/Makefile
+++ b/uds/Makefile
@@ -1,4 +1,4 @@
-UDS_VERSION = 8.1.0.351
+UDS_VERSION = 8.1.1.58
 
 SOURCES =  $(notdir $(wildcard $(src)/*.c)) murmur/MurmurHash3.c
 SOURCES += $(addprefix util/,$(notdir $(wildcard $(src)/util/*.c)))
diff --git a/uds/bits.c b/uds/bits.c
index d70ef8df..8ecd00f5 100644
--- a/uds/bits.c
+++ b/uds/bits.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/bits.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/bits.c#10 $
  */
 
 #include "bits.h"
diff --git a/uds/bits.h b/uds/bits.h
index 8891bef2..c3a28335 100644
--- a/uds/bits.h
+++ b/uds/bits.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/bits.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/bits.h#8 $
  */
 
 #ifndef BITS_H
diff --git a/uds/buffer.c b/uds/buffer.c
index b7525877..f3491108 100644
--- a/uds/buffer.c
+++ b/uds/buffer.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/buffer.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/buffer.c#15 $
  */
 
 #include "buffer.h"
diff --git a/uds/buffer.h b/uds/buffer.h
index 8b0a4b8f..bfb5d5fb 100644
--- a/uds/buffer.h
+++ b/uds/buffer.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/buffer.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/buffer.h#9 $
  */
 
 #ifndef BUFFER_H
diff --git a/uds/bufferPrivate.h b/uds/bufferPrivate.h
index adfc8ca5..bdf0edd9 100644
--- a/uds/bufferPrivate.h
+++ b/uds/bufferPrivate.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/bufferPrivate.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/bufferPrivate.h#3 $
  */
 
 #ifndef BUFFER_PRIVATE_H
diff --git a/uds/bufferedReader.c b/uds/bufferedReader.c
index cf719c52..80b860f0 100644
--- a/uds/bufferedReader.c
+++ b/uds/bufferedReader.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/bufferedReader.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/bufferedReader.c#17 $
  */
 
 #include "bufferedReader.h"
diff --git a/uds/bufferedReader.h b/uds/bufferedReader.h
index a499779d..48b43ba5 100644
--- a/uds/bufferedReader.h
+++ b/uds/bufferedReader.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/bufferedReader.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/bufferedReader.h#9 $
  */
 
 #ifndef BUFFERED_READER_H
diff --git a/uds/bufferedWriter.c b/uds/bufferedWriter.c
index 23e6a250..aa5b6a20 100644
--- a/uds/bufferedWriter.c
+++ b/uds/bufferedWriter.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/bufferedWriter.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/bufferedWriter.c#22 $
  */
 
 #include "bufferedWriter.h"
diff --git a/uds/bufferedWriter.h b/uds/bufferedWriter.h
index 9b35b988..94446cf2 100644
--- a/uds/bufferedWriter.h
+++ b/uds/bufferedWriter.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/bufferedWriter.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/bufferedWriter.h#12 $
  */
 
 #ifndef BUFFERED_WRITER_H
diff --git a/uds/cacheCounters.c b/uds/cacheCounters.c
index 639017fd..5537b92b 100644
--- a/uds/cacheCounters.c
+++ b/uds/cacheCounters.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/cacheCounters.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/cacheCounters.c#11 $
  */
 
 #include "cacheCounters.h"
diff --git a/uds/cacheCounters.h b/uds/cacheCounters.h
index cfad834d..cfd3fb2a 100644
--- a/uds/cacheCounters.h
+++ b/uds/cacheCounters.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/cacheCounters.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/cacheCounters.h#8 $
  */
 
 #ifndef CACHE_COUNTERS_H
diff --git a/uds/cachedChapterIndex.c b/uds/cachedChapterIndex.c
index 57a5d601..947b57d9 100644
--- a/uds/cachedChapterIndex.c
+++ b/uds/cachedChapterIndex.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/cachedChapterIndex.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/cachedChapterIndex.c#20 $
  */
 
 #include "cachedChapterIndex.h"
diff --git a/uds/cachedChapterIndex.h b/uds/cachedChapterIndex.h
index 7a1ffd2e..21521eda 100644
--- a/uds/cachedChapterIndex.h
+++ b/uds/cachedChapterIndex.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/cachedChapterIndex.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/cachedChapterIndex.h#15 $
  */
 
 #ifndef CACHED_CHAPTER_INDEX_H
diff --git a/uds/chapterIndex.c b/uds/chapterIndex.c
index e1bfd990..be48aada 100644
--- a/uds/chapterIndex.c
+++ b/uds/chapterIndex.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/chapterIndex.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/chapterIndex.c#20 $
  */
 
 #include "chapterIndex.h"
diff --git a/uds/chapterIndex.h b/uds/chapterIndex.h
index d29edccf..a7a450c3 100644
--- a/uds/chapterIndex.h
+++ b/uds/chapterIndex.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/chapterIndex.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/chapterIndex.h#12 $
  */
 
 #ifndef CHAPTER_INDEX_H
diff --git a/uds/chapterWriter.c b/uds/chapterWriter.c
index 74255f96..233fad9d 100644
--- a/uds/chapterWriter.c
+++ b/uds/chapterWriter.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/chapterWriter.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/chapterWriter.c#36 $
  */
 
 #include "chapterWriter.h"
diff --git a/uds/chapterWriter.h b/uds/chapterWriter.h
index 7e500afc..19b36b80 100644
--- a/uds/chapterWriter.h
+++ b/uds/chapterWriter.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/chapterWriter.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/chapterWriter.h#10 $
  */
 
 #ifndef CHAPTER_WRITER_H
diff --git a/uds/common.h b/uds/common.h
index 339fd6d8..55b34109 100644
--- a/uds/common.h
+++ b/uds/common.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/common.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/common.h#9 $
  */
 
 #ifndef COMMON_H
diff --git a/uds/compiler.h b/uds/compiler.h
index 99aabacd..631a69cf 100644
--- a/uds/compiler.h
+++ b/uds/compiler.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/compiler.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/compiler.h#10 $
  */
 
 #ifndef COMMON_COMPILER_H
diff --git a/uds/config.c b/uds/config.c
index 6f394777..ea8a3e49 100644
--- a/uds/config.c
+++ b/uds/config.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/config.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/config.c#20 $
  */
 
 #include "config.h"
diff --git a/uds/config.h b/uds/config.h
index bb1eb4fa..cff03d99 100644
--- a/uds/config.h
+++ b/uds/config.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/config.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/config.h#23 $
  */
 
 #ifndef CONFIG_H
diff --git a/uds/cpu.h b/uds/cpu.h
index b3d8c36c..6acad943 100644
--- a/uds/cpu.h
+++ b/uds/cpu.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/cpu.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/cpu.h#8 $
  */
 
 #ifndef CPU_H
diff --git a/uds/deltaIndex.c b/uds/deltaIndex.c
index 17daed9c..8742f17c 100644
--- a/uds/deltaIndex.c
+++ b/uds/deltaIndex.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/deltaIndex.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/deltaIndex.c#34 $
  */
 #include "deltaIndex.h"
 
diff --git a/uds/deltaIndex.h b/uds/deltaIndex.h
index 5d904e3f..6f681b5a 100644
--- a/uds/deltaIndex.h
+++ b/uds/deltaIndex.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/deltaIndex.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/deltaIndex.h#16 $
  */
 
 #ifndef DELTAINDEX_H
diff --git a/uds/deltaMemory.c b/uds/deltaMemory.c
index d89c8cd6..294382e0 100644
--- a/uds/deltaMemory.c
+++ b/uds/deltaMemory.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/deltaMemory.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/deltaMemory.c#25 $
  */
 #include "deltaMemory.h"
 
diff --git a/uds/deltaMemory.h b/uds/deltaMemory.h
index 1ece70eb..72af7147 100644
--- a/uds/deltaMemory.h
+++ b/uds/deltaMemory.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/deltaMemory.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/deltaMemory.h#13 $
  */
 
 #ifndef DELTAMEMORY_H
diff --git a/uds/errors.c b/uds/errors.c
index c3d4d772..023f6762 100644
--- a/uds/errors.c
+++ b/uds/errors.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/errors.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/errors.c#27 $
  */
 
 #include "errors.h"
diff --git a/uds/errors.h b/uds/errors.h
index ec33b294..719e80d8 100644
--- a/uds/errors.h
+++ b/uds/errors.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/errors.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/errors.h#16 $
  */
 
 #ifndef ERRORS_H
diff --git a/uds/geometry.c b/uds/geometry.c
index b88757a6..e38d1b19 100644
--- a/uds/geometry.c
+++ b/uds/geometry.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/geometry.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/geometry.c#17 $
  */
 
 #include "geometry.h"
diff --git a/uds/geometry.h b/uds/geometry.h
index ea55ad20..cf48b7fa 100644
--- a/uds/geometry.h
+++ b/uds/geometry.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/geometry.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/geometry.h#17 $
  */
 
 #ifndef GEOMETRY_H
diff --git a/uds/hashUtils.c b/uds/hashUtils.c
index 0a4d2ddb..3b62540c 100644
--- a/uds/hashUtils.c
+++ b/uds/hashUtils.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/hashUtils.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/hashUtils.c#14 $
  */
 
 #include "hashUtils.h"
diff --git a/uds/hashUtils.h b/uds/hashUtils.h
index 173c6e7f..ad969e22 100644
--- a/uds/hashUtils.h
+++ b/uds/hashUtils.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/hashUtils.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/hashUtils.h#13 $
  */
 
 #ifndef HASH_UTILS_H
diff --git a/uds/index.c b/uds/index.c
index dc0ee1f5..696f7b9d 100644
--- a/uds/index.c
+++ b/uds/index.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/index.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/index.c#73 $
  */
 
 
diff --git a/uds/index.h b/uds/index.h
index 59c6a015..ffe55870 100644
--- a/uds/index.h
+++ b/uds/index.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/index.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/index.h#28 $
  */
 
 #ifndef INDEX_H
@@ -27,7 +27,7 @@
 #include "indexSession.h"
 #include "indexZone.h"
 #include "loadType.h"
-#include "masterIndexOps.h"
+#include "volumeIndexOps.h"
 #include "request.h"
 #include "volume.h"
 
diff --git a/uds/indexCheckpoint.c b/uds/indexCheckpoint.c
index 7dc4cbeb..57077a8b 100644
--- a/uds/indexCheckpoint.c
+++ b/uds/indexCheckpoint.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexCheckpoint.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexCheckpoint.c#20 $
  */
 
 #include "indexCheckpoint.h"
diff --git a/uds/indexCheckpoint.h b/uds/indexCheckpoint.h
index 8f8810a4..a98c68ea 100644
--- a/uds/indexCheckpoint.h
+++ b/uds/indexCheckpoint.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexCheckpoint.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexCheckpoint.h#6 $
  */
 
 #ifndef INDEX_CHECKPOINT_H
diff --git a/uds/indexComponent.c b/uds/indexComponent.c
index 6b2af588..83810f21 100644
--- a/uds/indexComponent.c
+++ b/uds/indexComponent.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexComponent.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexComponent.c#24 $
  */
 
 #include "indexComponent.h"
diff --git a/uds/indexComponent.h b/uds/indexComponent.h
index f614b699..760ac3dc 100644
--- a/uds/indexComponent.h
+++ b/uds/indexComponent.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexComponent.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexComponent.h#14 $
  */
 
 #ifndef INDEX_COMPONENT_H
diff --git a/uds/indexConfig.c b/uds/indexConfig.c
index d32c3582..154f5fb4 100644
--- a/uds/indexConfig.c
+++ b/uds/indexConfig.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexConfig.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexConfig.c#26 $
  */
 
 #include "indexConfig.h"
diff --git a/uds/indexConfig.h b/uds/indexConfig.h
index ad2372ec..7f170cc1 100644
--- a/uds/indexConfig.h
+++ b/uds/indexConfig.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexConfig.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexConfig.h#5 $
  */
 
 #ifndef INDEX_CONFIG_H
diff --git a/uds/indexLayout.c b/uds/indexLayout.c
index 7ebb19a8..6bcb7233 100644
--- a/uds/indexLayout.c
+++ b/uds/indexLayout.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexLayout.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexLayout.c#83 $
  */
 
 #include "indexLayout.h"
@@ -27,7 +27,7 @@
 #include "indexConfig.h"
 #include "layoutRegion.h"
 #include "logger.h"
-#include "masterIndexOps.h"
+#include "volumeIndexOps.h"
 #include "memoryAlloc.h"
 #include "nonce.h"
 #include "openChapter.h"
diff --git a/uds/indexLayout.h b/uds/indexLayout.h
index 719ff8ca..80848993 100644
--- a/uds/indexLayout.h
+++ b/uds/indexLayout.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexLayout.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexLayout.h#34 $
  */
 
 #ifndef INDEX_LAYOUT_H
diff --git a/uds/indexLayoutLinuxKernel.c b/uds/indexLayoutLinuxKernel.c
index 24b5f83e..c33442c4 100644
--- a/uds/indexLayoutLinuxKernel.c
+++ b/uds/indexLayoutLinuxKernel.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/kernelLinux/uds/indexLayoutLinuxKernel.c#1 $
+ * $Id: //eng/uds-releases/krusty/kernelLinux/uds/indexLayoutLinuxKernel.c#16 $
  */
 
 #include "indexLayout.h"
diff --git a/uds/indexLayoutParser.c b/uds/indexLayoutParser.c
index fbeeb1b0..f6d0df58 100644
--- a/uds/indexLayoutParser.c
+++ b/uds/indexLayoutParser.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexLayoutParser.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexLayoutParser.c#14 $
  */
 
 #include "indexLayoutParser.h"
diff --git a/uds/indexLayoutParser.h b/uds/indexLayoutParser.h
index a6de681e..53a1d823 100644
--- a/uds/indexLayoutParser.h
+++ b/uds/indexLayoutParser.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexLayoutParser.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexLayoutParser.h#9 $
  */
 
 #ifndef INDEX_LAYOUT_PARSER_H
diff --git a/uds/indexPageMap.c b/uds/indexPageMap.c
index ba2c3d10..6165662d 100644
--- a/uds/indexPageMap.c
+++ b/uds/indexPageMap.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexPageMap.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexPageMap.c#32 $
  */
 
 #include "indexPageMap.h"
diff --git a/uds/indexPageMap.h b/uds/indexPageMap.h
index 3b61357f..c2d68860 100644
--- a/uds/indexPageMap.h
+++ b/uds/indexPageMap.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexPageMap.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexPageMap.h#10 $
  */
 
 #ifndef INDEX_PAGE_MAP_H
diff --git a/uds/indexSession.c b/uds/indexSession.c
index 40569aa8..9cef17e9 100644
--- a/uds/indexSession.c
+++ b/uds/indexSession.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexSession.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexSession.c#54 $
  */
 
 #include "indexSession.h"
diff --git a/uds/indexSession.h b/uds/indexSession.h
index 0405854d..8d98d126 100644
--- a/uds/indexSession.h
+++ b/uds/indexSession.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexSession.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexSession.h#21 $
  */
 
 #ifndef INDEX_SESSION_H
diff --git a/uds/indexState.c b/uds/indexState.c
index 0fb81bca..6da3f46f 100644
--- a/uds/indexState.c
+++ b/uds/indexState.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexState.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexState.c#28 $
  */
 
 #include "indexState.h"
diff --git a/uds/indexState.h b/uds/indexState.h
index c2fa811f..bfbd1fd0 100644
--- a/uds/indexState.h
+++ b/uds/indexState.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexState.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexState.h#19 $
  */
 
 #ifndef INDEX_STATE_H
diff --git a/uds/indexStateData.c b/uds/indexStateData.c
index 9201b486..6aec0ddb 100644
--- a/uds/indexStateData.c
+++ b/uds/indexStateData.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexStateData.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexStateData.c#22 $
  */
 
 #include "indexStateData.h"
diff --git a/uds/indexStateData.h b/uds/indexStateData.h
index 38495b54..02028817 100644
--- a/uds/indexStateData.h
+++ b/uds/indexStateData.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexStateData.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexStateData.h#4 $
  */
 
 #ifndef INDEX_STATE_DATA_H
diff --git a/uds/indexZone.c b/uds/indexZone.c
index 7f8f67a7..80fa4dc2 100644
--- a/uds/indexZone.c
+++ b/uds/indexZone.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexZone.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexZone.c#43 $
  */
 
 #include "indexZone.h"
diff --git a/uds/indexZone.h b/uds/indexZone.h
index b54082fc..129498ab 100644
--- a/uds/indexZone.h
+++ b/uds/indexZone.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/indexZone.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/indexZone.h#18 $
  */
 
 #ifndef INDEX_ZONE_H
diff --git a/uds/ioFactory.h b/uds/ioFactory.h
index 180436e3..7c6b67bc 100644
--- a/uds/ioFactory.h
+++ b/uds/ioFactory.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/ioFactory.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/ioFactory.h#12 $
  */
 
 #ifndef IO_FACTORY_H
diff --git a/uds/ioFactoryLinuxKernel.c b/uds/ioFactoryLinuxKernel.c
index 61d4ef46..39edb6cf 100644
--- a/uds/ioFactoryLinuxKernel.c
+++ b/uds/ioFactoryLinuxKernel.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/kernelLinux/uds/ioFactoryLinuxKernel.c#1 $
+ * $Id: //eng/uds-releases/krusty/kernelLinux/uds/ioFactoryLinuxKernel.c#18 $
  */
 
 #include <linux/atomic.h>
diff --git a/uds/layoutRegion.h b/uds/layoutRegion.h
index fb276a30..4c38804a 100644
--- a/uds/layoutRegion.h
+++ b/uds/layoutRegion.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/layoutRegion.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/layoutRegion.h#8 $
  */
 
 #ifndef LAYOUT_REGION_H
diff --git a/uds/loadType.c b/uds/loadType.c
index c2497a47..f63b1399 100644
--- a/uds/loadType.c
+++ b/uds/loadType.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/loadType.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/loadType.c#6 $
  */
 
 #include "loadType.h"
diff --git a/uds/loadType.h b/uds/loadType.h
index 6af65ba9..f4d78983 100644
--- a/uds/loadType.h
+++ b/uds/loadType.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/loadType.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/loadType.h#7 $
  */
 
 #ifndef LOAD_TYPE_H
diff --git a/uds/logger.c b/uds/logger.c
index ebf63962..a2906567 100644
--- a/uds/logger.c
+++ b/uds/logger.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/logger.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/logger.c#25 $
  */
 
 #include "logger.h"
diff --git a/uds/logger.h b/uds/logger.h
index 2355aa9f..a84465c6 100644
--- a/uds/logger.h
+++ b/uds/logger.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/logger.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/logger.h#28 $
  */
 
 #ifndef LOGGER_H
diff --git a/uds/loggerLinuxKernel.c b/uds/loggerLinuxKernel.c
index c3c455be..a9bb5a79 100644
--- a/uds/loggerLinuxKernel.c
+++ b/uds/loggerLinuxKernel.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/kernelLinux/uds/loggerLinuxKernel.c#1 $
+ * $Id: //eng/uds-releases/krusty/kernelLinux/uds/loggerLinuxKernel.c#19 $
  */
 
 #include <linux/delay.h>
diff --git a/uds/memoryAlloc.c b/uds/memoryAlloc.c
index 22fb91b1..353a3d10 100644
--- a/uds/memoryAlloc.c
+++ b/uds/memoryAlloc.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/memoryAlloc.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/memoryAlloc.c#5 $
  */
 
 #include "memoryAlloc.h"
diff --git a/uds/memoryAlloc.h b/uds/memoryAlloc.h
index b5a734b7..b144a708 100644
--- a/uds/memoryAlloc.h
+++ b/uds/memoryAlloc.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/memoryAlloc.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/memoryAlloc.h#20 $
  */
 
 #ifndef MEMORY_ALLOC_H
diff --git a/uds/memoryLinuxKernel.c b/uds/memoryLinuxKernel.c
index de6e359b..b8e86b24 100644
--- a/uds/memoryLinuxKernel.c
+++ b/uds/memoryLinuxKernel.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/kernelLinux/uds/memoryLinuxKernel.c#1 $
+ * $Id: //eng/uds-releases/krusty/kernelLinux/uds/memoryLinuxKernel.c#31 $
  */
 
 #include <linux/delay.h>
diff --git a/uds/nonce.c b/uds/nonce.c
index 2e0fd6af..d4ab1810 100644
--- a/uds/nonce.c
+++ b/uds/nonce.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/nonce.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/nonce.c#16 $
  */
 
 #include "nonce.h"
diff --git a/uds/nonce.h b/uds/nonce.h
index 25fca558..a2e688b6 100644
--- a/uds/nonce.h
+++ b/uds/nonce.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/nonce.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/nonce.h#7 $
  */
 
 #ifndef NONCE_H
diff --git a/uds/numeric.h b/uds/numeric.h
index 0589f9e8..8f1595b9 100644
--- a/uds/numeric.h
+++ b/uds/numeric.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/numeric.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/numeric.h#13 $
  */
 
 #ifndef NUMERIC_H
diff --git a/uds/openChapter.c b/uds/openChapter.c
index 98a6ea4f..5da67b43 100644
--- a/uds/openChapter.c
+++ b/uds/openChapter.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/openChapter.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/openChapter.c#37 $
  */
 
 #include "openChapter.h"
diff --git a/uds/openChapter.h b/uds/openChapter.h
index 5b4e3f14..9d98cd54 100644
--- a/uds/openChapter.h
+++ b/uds/openChapter.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/openChapter.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/openChapter.h#15 $
  */
 
 #ifndef OPENCHAPTER_H
diff --git a/uds/openChapterZone.c b/uds/openChapterZone.c
index 0eb0ae29..c7595978 100644
--- a/uds/openChapterZone.c
+++ b/uds/openChapterZone.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/openChapterZone.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/openChapterZone.c#21 $
  */
 
 #include "openChapterZone.h"
diff --git a/uds/openChapterZone.h b/uds/openChapterZone.h
index b00de659..af9574f4 100644
--- a/uds/openChapterZone.h
+++ b/uds/openChapterZone.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/openChapterZone.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/openChapterZone.h#12 $
  */
 
 #ifndef OPEN_CHAPTER_ZONE_H
diff --git a/uds/pageCache.c b/uds/pageCache.c
index 32e2edd7..13c5cad3 100644
--- a/uds/pageCache.c
+++ b/uds/pageCache.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/pageCache.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/pageCache.c#34 $
  */
 
 #include "pageCache.h"
diff --git a/uds/pageCache.h b/uds/pageCache.h
index 6e17a594..c36abd91 100644
--- a/uds/pageCache.h
+++ b/uds/pageCache.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/pageCache.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/pageCache.h#20 $
  */
 
 #ifndef PAGE_CACHE_H
diff --git a/uds/permassert.c b/uds/permassert.c
index d78b5074..c1904b63 100644
--- a/uds/permassert.c
+++ b/uds/permassert.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/permassert.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/permassert.c#19 $
  */
 
 #include "permassert.h"
diff --git a/uds/permassert.h b/uds/permassert.h
index a5fb293b..cf8faa0b 100644
--- a/uds/permassert.h
+++ b/uds/permassert.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/permassert.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/permassert.h#10 $
  */
 
 #ifndef PERMASSERT_H
diff --git a/uds/random.c b/uds/random.c
index ef444e63..931d7ece 100644
--- a/uds/random.c
+++ b/uds/random.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/random.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/random.c#4 $
  */
 
 #include "random.h"
diff --git a/uds/random.h b/uds/random.h
index 59b72789..6b5df868 100644
--- a/uds/random.h
+++ b/uds/random.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/random.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/random.h#4 $
  */
 
 #ifndef RANDOM_H
diff --git a/uds/recordPage.c b/uds/recordPage.c
index 0f96c106..cd74ad34 100644
--- a/uds/recordPage.c
+++ b/uds/recordPage.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/recordPage.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/recordPage.c#15 $
  */
 
 #include "recordPage.h"
diff --git a/uds/recordPage.h b/uds/recordPage.h
index f5eaf2b2..b1dce9a7 100644
--- a/uds/recordPage.h
+++ b/uds/recordPage.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/recordPage.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/recordPage.h#9 $
  */
 
 #ifndef RECORDPAGE_H
diff --git a/uds/regionIdentifiers.h b/uds/regionIdentifiers.h
index 528006c7..08264cf2 100644
--- a/uds/regionIdentifiers.h
+++ b/uds/regionIdentifiers.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/regionIdentifiers.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/regionIdentifiers.h#7 $
  */
 
 #ifndef REGION_IDENTIFIERS_H
diff --git a/uds/request.c b/uds/request.c
index 124436f3..c0ce95cf 100644
--- a/uds/request.c
+++ b/uds/request.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/request.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/request.c#27 $
  */
 
 #include "request.h"
diff --git a/uds/request.h b/uds/request.h
index 92dd858b..d71fb1e4 100644
--- a/uds/request.h
+++ b/uds/request.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/request.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/request.h#21 $
  */
 
 #ifndef REQUEST_H
diff --git a/uds/requestQueue.h b/uds/requestQueue.h
index b6bd5797..fecf524c 100644
--- a/uds/requestQueue.h
+++ b/uds/requestQueue.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/requestQueue.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/requestQueue.h#10 $
  */
 
 #ifndef REQUEST_QUEUE_H
diff --git a/uds/requestQueueKernel.c b/uds/requestQueueKernel.c
index 28d6b07f..117dba2c 100644
--- a/uds/requestQueueKernel.c
+++ b/uds/requestQueueKernel.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/kernelLinux/uds/requestQueueKernel.c#1 $
+ * $Id: //eng/uds-releases/krusty/kernelLinux/uds/requestQueueKernel.c#28 $
  */
 
 #include "requestQueue.h"
diff --git a/uds/searchList.c b/uds/searchList.c
index b6360357..b0f18dba 100644
--- a/uds/searchList.c
+++ b/uds/searchList.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/searchList.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/searchList.c#15 $
  */
 
 #include "searchList.h"
diff --git a/uds/searchList.h b/uds/searchList.h
index 7bd0c80f..8aa48b72 100644
--- a/uds/searchList.h
+++ b/uds/searchList.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/searchList.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/searchList.h#9 $
  */
 
 #ifndef SEARCH_LIST_H
diff --git a/uds/sparseCache.c b/uds/sparseCache.c
index d6000f2b..e388aa0b 100644
--- a/uds/sparseCache.c
+++ b/uds/sparseCache.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/sparseCache.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/sparseCache.c#35 $
  */
 
 /**
diff --git a/uds/sparseCache.h b/uds/sparseCache.h
index 664f066b..0806d3bd 100644
--- a/uds/sparseCache.h
+++ b/uds/sparseCache.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/sparseCache.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/sparseCache.h#11 $
  */
 
 #ifndef SPARSE_CACHE_H
diff --git a/uds/stringLinuxKernel.c b/uds/stringLinuxKernel.c
index 4b4a729a..85a10e37 100644
--- a/uds/stringLinuxKernel.c
+++ b/uds/stringLinuxKernel.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/kernelLinux/uds/stringLinuxKernel.c#1 $
+ * $Id: //eng/uds-releases/krusty/kernelLinux/uds/stringLinuxKernel.c#8 $
  */
 
 #include <linux/mm.h>
diff --git a/uds/stringUtils.c b/uds/stringUtils.c
index c3c5f537..7b7140b7 100644
--- a/uds/stringUtils.c
+++ b/uds/stringUtils.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/stringUtils.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/stringUtils.c#16 $
  */
 
 #include "stringUtils.h"
diff --git a/uds/stringUtils.h b/uds/stringUtils.h
index 7b890ebb..305e28eb 100644
--- a/uds/stringUtils.h
+++ b/uds/stringUtils.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/stringUtils.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/stringUtils.h#14 $
  */
 
 #ifndef STRING_UTILS_H
diff --git a/uds/sysfs.c b/uds/sysfs.c
index 787f75a6..abc250fa 100644
--- a/uds/sysfs.c
+++ b/uds/sysfs.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/kernelLinux/uds/sysfs.c#1 $
+ * $Id: //eng/uds-releases/krusty/kernelLinux/uds/sysfs.c#18 $
  */
 
 #include "sysfs.h"
diff --git a/uds/sysfs.h b/uds/sysfs.h
index 98e92952..304d0328 100644
--- a/uds/sysfs.h
+++ b/uds/sysfs.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/kernelLinux/uds/sysfs.h#1 $
+ * $Id: //eng/uds-releases/krusty/kernelLinux/uds/sysfs.h#4 $
  */
 
 #ifndef SYSFS_H
diff --git a/uds/threadCondVarLinuxKernel.c b/uds/threadCondVarLinuxKernel.c
index a0c83de6..49c484b2 100644
--- a/uds/threadCondVarLinuxKernel.c
+++ b/uds/threadCondVarLinuxKernel.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/kernelLinux/uds/threadCondVarLinuxKernel.c#1 $
+ * $Id: //eng/uds-releases/krusty/kernelLinux/uds/threadCondVarLinuxKernel.c#15 $
  */
 
 #include "errors.h"
diff --git a/uds/threadDevice.c b/uds/threadDevice.c
index 90142fde..f3201b83 100644
--- a/uds/threadDevice.c
+++ b/uds/threadDevice.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/kernelLinux/uds/threadDevice.c#1 $
+ * $Id: //eng/uds-releases/krusty/kernelLinux/uds/threadDevice.c#5 $
  */
 
 #include "threadDevice.h"
diff --git a/uds/threadDevice.h b/uds/threadDevice.h
index 806c1bae..e8b0dc1f 100644
--- a/uds/threadDevice.h
+++ b/uds/threadDevice.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/kernelLinux/uds/threadDevice.h#1 $
+ * $Id: //eng/uds-releases/krusty/kernelLinux/uds/threadDevice.h#3 $
  */
 
 #ifndef UDS_THREAD_DEVICE_H
diff --git a/uds/threadOnce.c b/uds/threadOnce.c
index 6cfd4455..4adbbc19 100644
--- a/uds/threadOnce.c
+++ b/uds/threadOnce.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/threadOnce.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/threadOnce.c#10 $
  */
 
 #include "errors.h"
diff --git a/uds/threadOnce.h b/uds/threadOnce.h
index ce6f0f6a..7ed0d691 100644
--- a/uds/threadOnce.h
+++ b/uds/threadOnce.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/threadOnce.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/threadOnce.h#7 $
  */
 
 #ifndef THREAD_ONCE_H
diff --git a/uds/threadRegistry.c b/uds/threadRegistry.c
index e0c06ba0..fa666bc4 100644
--- a/uds/threadRegistry.c
+++ b/uds/threadRegistry.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/kernelLinux/uds/threadRegistry.c#1 $
+ * $Id: //eng/uds-releases/krusty/kernelLinux/uds/threadRegistry.c#10 $
  */
 
 #include "threadRegistry.h"
diff --git a/uds/threadRegistry.h b/uds/threadRegistry.h
index 2c899944..05420c24 100644
--- a/uds/threadRegistry.h
+++ b/uds/threadRegistry.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/kernelLinux/uds/threadRegistry.h#1 $
+ * $Id: //eng/uds-releases/krusty/kernelLinux/uds/threadRegistry.h#7 $
  */
 
 #ifndef THREAD_REGISTRY_H
diff --git a/uds/threadsLinuxKernel.c b/uds/threadsLinuxKernel.c
index 9810e442..c4d2ab26 100644
--- a/uds/threadsLinuxKernel.c
+++ b/uds/threadsLinuxKernel.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/kernelLinux/uds/threadsLinuxKernel.c#1 $
+ * $Id: //eng/uds-releases/krusty/kernelLinux/uds/threadsLinuxKernel.c#23 $
  */
 
 #include <linux/completion.h>
diff --git a/uds/timeUtils.c b/uds/timeUtils.c
index 4b11eeff..ba178584 100644
--- a/uds/timeUtils.c
+++ b/uds/timeUtils.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/timeUtils.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/timeUtils.c#19 $
  */
 
 #include "permassert.h"
diff --git a/uds/timeUtils.h b/uds/timeUtils.h
index 9da979b7..e6b32815 100644
--- a/uds/timeUtils.h
+++ b/uds/timeUtils.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/timeUtils.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/timeUtils.h#17 $
  */
 
 #ifndef TIME_UTILS_H
diff --git a/uds/typeDefs.h b/uds/typeDefs.h
index be1a8fdb..c65a5053 100644
--- a/uds/typeDefs.h
+++ b/uds/typeDefs.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/typeDefs.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/typeDefs.h#7 $
  */
 
 #ifndef TYPE_DEFS_H
diff --git a/uds/uds-platform.h b/uds/uds-platform.h
index 81a70423..4ea7c39f 100644
--- a/uds/uds-platform.h
+++ b/uds/uds-platform.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/uds-platform.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/uds-platform.h#2 $
  */
 
 /**
diff --git a/uds/uds-threads.h b/uds/uds-threads.h
index 715ac009..8e1a5892 100644
--- a/uds/uds-threads.h
+++ b/uds/uds-threads.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/uds-threads.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/uds-threads.h#9 $
  */
 
 #ifndef UDS_THREADS_H
diff --git a/uds/uds.h b/uds/uds.h
index 21201031..50c26818 100644
--- a/uds/uds.h
+++ b/uds/uds.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/uds.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/uds.h#36 $
  */
 
 /**
diff --git a/uds/udsMain.c b/uds/udsMain.c
index e0c963cd..ad353026 100644
--- a/uds/udsMain.c
+++ b/uds/udsMain.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/udsMain.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/udsMain.c#38 $
  */
 
 #include "uds.h"
diff --git a/uds/udsModule.c b/uds/udsModule.c
index 7698519e..e79a3654 100644
--- a/uds/udsModule.c
+++ b/uds/udsModule.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/kernelLinux/uds/udsModule.c#1 $
+ * $Id: //eng/uds-releases/krusty/kernelLinux/uds/udsModule.c#124 $
  */
 
 #include <linux/module.h>
diff --git a/uds/util/eventCount.c b/uds/util/eventCount.c
index 2f237ee3..af7cc087 100644
--- a/uds/util/eventCount.c
+++ b/uds/util/eventCount.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/util/eventCount.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/util/eventCount.c#17 $
  */
 
 /**
diff --git a/uds/util/eventCount.h b/uds/util/eventCount.h
index ed067508..6ba49b23 100644
--- a/uds/util/eventCount.h
+++ b/uds/util/eventCount.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/util/eventCount.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/util/eventCount.h#9 $
  */
 
 #ifndef EVENT_COUNT_H
diff --git a/uds/util/funnelQueue.c b/uds/util/funnelQueue.c
index bb9f3b05..6dde6c8a 100644
--- a/uds/util/funnelQueue.c
+++ b/uds/util/funnelQueue.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/util/funnelQueue.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/util/funnelQueue.c#12 $
  */
 
 #include "funnelQueue.h"
diff --git a/uds/util/funnelQueue.h b/uds/util/funnelQueue.h
index 0fe69e9a..a8370cd6 100644
--- a/uds/util/funnelQueue.h
+++ b/uds/util/funnelQueue.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/util/funnelQueue.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/util/funnelQueue.h#11 $
  */
 
 #ifndef FUNNEL_QUEUE_H
diff --git a/uds/util/radixSort.c b/uds/util/radixSort.c
index 28e8bad8..5174e5dd 100644
--- a/uds/util/radixSort.c
+++ b/uds/util/radixSort.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/util/radixSort.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/util/radixSort.c#10 $
  */
 
 /*
diff --git a/uds/util/radixSort.h b/uds/util/radixSort.h
index df0ecf49..a209dc74 100644
--- a/uds/util/radixSort.h
+++ b/uds/util/radixSort.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/util/radixSort.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/util/radixSort.h#7 $
  */
 
 #ifndef RADIX_SORT_H
diff --git a/uds/volume.c b/uds/volume.c
index 4a08ab4a..d86dc93f 100644
--- a/uds/volume.c
+++ b/uds/volume.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/volume.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/volume.c#57 $
  */
 
 #include "volume.h"
diff --git a/uds/volume.h b/uds/volume.h
index f57aa735..aaef0d5a 100644
--- a/uds/volume.h
+++ b/uds/volume.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/volume.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/volume.h#28 $
  */
 
 #ifndef VOLUME_H
diff --git a/uds/masterIndex005.c b/uds/volumeIndex005.c
similarity index 99%
rename from uds/masterIndex005.c
rename to uds/volumeIndex005.c
index 6f92bd6b..d7129e6a 100644
--- a/uds/masterIndex005.c
+++ b/uds/volumeIndex005.c
@@ -16,9 +16,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/masterIndex005.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/volumeIndex005.c#5 $
  */
-#include "masterIndex005.h"
+#include "volumeIndex005.h"
 
 #include "buffer.h"
 #include "compiler.h"
@@ -1497,7 +1497,7 @@ compute_volume_index_parameters005(const struct configuration *config,
 	 * Set the total memory to be 6% larger than the expected index size.
 	 * We want this number to be large enough that the we do not do a great
 	 * many rebalances as the list when the list is full.  We use
-	 * MasterIndex_p1 to tune this setting.
+	 * VolumeIndex_p1 to tune this setting.
 	 */
 	params->memory_size = expected_index_size * 106 / 100;
 	// Set the target free size to 5% of the expected index size
diff --git a/uds/masterIndex005.h b/uds/volumeIndex005.h
similarity index 89%
rename from uds/masterIndex005.h
rename to uds/volumeIndex005.h
index 0e8c7759..970a894f 100644
--- a/uds/masterIndex005.h
+++ b/uds/volumeIndex005.h
@@ -16,13 +16,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/masterIndex005.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/volumeIndex005.h#3 $
  */
 
-#ifndef MASTERINDEX005_H
-#define MASTERINDEX005_H 1
+#ifndef VOLUMEINDEX005_H
+#define VOLUMEINDEX005_H 1
 
-#include "masterIndexOps.h"
+#include "volumeIndexOps.h"
 
 /**
  * Make a new volume index.
@@ -52,4 +52,4 @@ int __must_check
 compute_volume_index_save_bytes005(const struct configuration *config,
 				   size_t *num_bytes);
 
-#endif /* MASTERINDEX005_H */
+#endif /* VOLUMEINDEX005_H */
diff --git a/uds/masterIndex006.c b/uds/volumeIndex006.c
similarity index 99%
rename from uds/masterIndex006.c
rename to uds/volumeIndex006.c
index daa6c977..bbb5a9eb 100644
--- a/uds/masterIndex006.c
+++ b/uds/volumeIndex006.c
@@ -16,16 +16,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/masterIndex006.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/volumeIndex006.c#5 $
  */
-#include "masterIndex006.h"
+#include "volumeIndex006.h"
 
 #include "buffer.h"
 #include "compiler.h"
 #include "errors.h"
 #include "hashUtils.h"
 #include "logger.h"
-#include "masterIndex005.h"
+#include "volumeIndex005.h"
 #include "memoryAlloc.h"
 #include "permassert.h"
 #include "uds-threads.h"
diff --git a/uds/masterIndex006.h b/uds/volumeIndex006.h
similarity index 89%
rename from uds/masterIndex006.h
rename to uds/volumeIndex006.h
index a31732ae..1b3416f5 100644
--- a/uds/masterIndex006.h
+++ b/uds/volumeIndex006.h
@@ -16,13 +16,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/masterIndex006.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/volumeIndex006.h#3 $
  */
 
-#ifndef MASTERINDEX006_H
-#define MASTERINDEX006_H 1
+#ifndef VOLUMEINDEX006_H
+#define VOLUMEINDEX006_H 1
 
-#include "masterIndexOps.h"
+#include "volumeIndexOps.h"
 
 /**
  * Make a new volume index.
@@ -52,4 +52,4 @@ int __must_check
 compute_volume_index_save_bytes006(const struct configuration *config,
 				   size_t *num_bytes);
 
-#endif /* MASTERINDEX006_H */
+#endif /* VOLUMEINDEX006_H */
diff --git a/uds/masterIndexOps.c b/uds/volumeIndexOps.c
similarity index 97%
rename from uds/masterIndexOps.c
rename to uds/volumeIndexOps.c
index 40bd6e08..e6cdbb88 100644
--- a/uds/masterIndexOps.c
+++ b/uds/volumeIndexOps.c
@@ -16,17 +16,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/masterIndexOps.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/volumeIndexOps.c#5 $
  */
-#include "masterIndexOps.h"
+#include "volumeIndexOps.h"
 
 #include "compiler.h"
 #include "errors.h"
 #include "geometry.h"
 #include "indexComponent.h"
 #include "logger.h"
-#include "masterIndex005.h"
-#include "masterIndex006.h"
+#include "volumeIndex005.h"
+#include "volumeIndex006.h"
 #include "memoryAlloc.h"
 #include "permassert.h"
 #include "uds.h"
diff --git a/uds/masterIndexOps.h b/uds/volumeIndexOps.h
similarity index 99%
rename from uds/masterIndexOps.h
rename to uds/volumeIndexOps.h
index 23042854..ccd3bb9d 100644
--- a/uds/masterIndexOps.h
+++ b/uds/volumeIndexOps.h
@@ -16,11 +16,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/masterIndexOps.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/volumeIndexOps.h#4 $
  */
 
-#ifndef MASTERINDEXOPS_H
-#define MASTERINDEXOPS_H 1
+#ifndef VOLUMEINDEXOPS_H
+#define VOLUMEINDEXOPS_H 1
 
 #include "compiler.h"
 #include "deltaIndex.h"
@@ -559,4 +559,4 @@ start_saving_volume_index(const struct volume_index *volume_index,
 						       buffered_writer);
 }
 
-#endif /* MASTERINDEXOPS_H */
+#endif /* VOLUMEINDEXOPS_H */
diff --git a/uds/volumeStore.c b/uds/volumeStore.c
index c1e01b99..a371b1f0 100644
--- a/uds/volumeStore.c
+++ b/uds/volumeStore.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/volumeStore.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/volumeStore.c#21 $
  */
 
 #include "geometry.h"
diff --git a/uds/volumeStore.h b/uds/volumeStore.h
index 1bb0db3c..1fe41c21 100644
--- a/uds/volumeStore.h
+++ b/uds/volumeStore.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/volumeStore.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/volumeStore.h#8 $
  */
 
 #ifndef VOLUME_STORE_H
diff --git a/uds/zone.c b/uds/zone.c
index 76a6aa63..dcf76fbd 100644
--- a/uds/zone.c
+++ b/uds/zone.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/zone.c#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/zone.c#8 $
  */
 
 #include "zone.h"
diff --git a/uds/zone.h b/uds/zone.h
index 1c35ed2e..028801c1 100644
--- a/uds/zone.h
+++ b/uds/zone.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/krusty-rhel9.0-beta/src/uds/zone.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/zone.h#5 $
  */
 
 #ifndef ZONE_H
diff --git a/vdo/Makefile b/vdo/Makefile
index 37676cde..31210fc0 100644
--- a/vdo/Makefile
+++ b/vdo/Makefile
@@ -1,4 +1,4 @@
-VDO_VERSION = 8.1.0.316
+VDO_VERSION = 8.1.1.287
 
 VDO_VERSION_MAJOR = $(word 1,$(subst ., ,$(VDO_VERSION)))
 VDO_VERSION_MINOR = $(word 2,$(subst ., ,$(VDO_VERSION)))
diff --git a/vdo/actionManager.c b/vdo/actionManager.c
index ccabefc7..78c2c8c2 100644
--- a/vdo/actionManager.c
+++ b/vdo/actionManager.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/actionManager.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/actionManager.c#14 $
  */
 
 #include "actionManager.h"
diff --git a/vdo/actionManager.h b/vdo/actionManager.h
index 4f0d73bf..2179845f 100644
--- a/vdo/actionManager.h
+++ b/vdo/actionManager.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/actionManager.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/actionManager.h#6 $
  */
 
 #ifndef ACTION_MANAGER_H
diff --git a/vdo/adminCompletion.c b/vdo/adminCompletion.c
index af63bd07..80f264bc 100644
--- a/vdo/adminCompletion.c
+++ b/vdo/adminCompletion.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/adminCompletion.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/adminCompletion.c#20 $
  */
 
 #include "adminCompletion.h"
diff --git a/vdo/adminCompletion.h b/vdo/adminCompletion.h
index a3fb1d57..62eeb57f 100644
--- a/vdo/adminCompletion.h
+++ b/vdo/adminCompletion.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/adminCompletion.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/adminCompletion.h#10 $
  */
 
 #ifndef ADMIN_COMPLETION_H
diff --git a/vdo/adminState.c b/vdo/adminState.c
index 370a5caf..a94d35f7 100644
--- a/vdo/adminState.c
+++ b/vdo/adminState.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/adminState.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/adminState.c#21 $
  */
 
 #include "adminState.h"
diff --git a/vdo/adminState.h b/vdo/adminState.h
index d4585e6d..b8842e74 100644
--- a/vdo/adminState.h
+++ b/vdo/adminState.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/adminState.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/adminState.h#16 $
  */
 
 #ifndef ADMIN_STATE_H
diff --git a/vdo/allocatingVIO.c b/vdo/allocatingVIO.c
index a3d00665..54dff260 100644
--- a/vdo/allocatingVIO.c
+++ b/vdo/allocatingVIO.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/allocatingVIO.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/allocatingVIO.c#24 $
  */
 
 #include "allocatingVIO.h"
diff --git a/vdo/allocatingVIO.h b/vdo/allocatingVIO.h
index 3ff7f4cd..230c41bd 100644
--- a/vdo/allocatingVIO.h
+++ b/vdo/allocatingVIO.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/allocatingVIO.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/allocatingVIO.h#12 $
  */
 
 #ifndef ALLOCATING_VIO_H
diff --git a/vdo/allocationSelector.c b/vdo/allocationSelector.c
index 999e96f9..9b562cbc 100644
--- a/vdo/allocationSelector.c
+++ b/vdo/allocationSelector.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/allocationSelector.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/allocationSelector.c#7 $
  */
 
 #include "allocationSelector.h"
diff --git a/vdo/allocationSelector.h b/vdo/allocationSelector.h
index ee59dbfb..03baea2b 100644
--- a/vdo/allocationSelector.h
+++ b/vdo/allocationSelector.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/allocationSelector.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/allocationSelector.h#5 $
  */
 
 #ifndef ALLOCATION_SELECTOR_H
diff --git a/vdo/allocationSelectorInternals.h b/vdo/allocationSelectorInternals.h
index 4e28cbba..7f0246be 100644
--- a/vdo/allocationSelectorInternals.h
+++ b/vdo/allocationSelectorInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/allocationSelectorInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/allocationSelectorInternals.h#2 $
  */
 
 #ifndef ALLOCATION_SELECTOR_INTERNALS_H
diff --git a/vdo/atomicStats.h b/vdo/atomicStats.h
index afee2fd9..cdb458b6 100644
--- a/vdo/atomicStats.h
+++ b/vdo/atomicStats.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/atomicStats.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/atomicStats.h#6 $
  */
 
 #ifndef ATOMIC_STATS_H
diff --git a/vdo/batchProcessor.c b/vdo/batchProcessor.c
index 511e64e7..9685beda 100644
--- a/vdo/batchProcessor.c
+++ b/vdo/batchProcessor.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/batchProcessor.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/batchProcessor.c#14 $
  */
 
 #include "batchProcessor.h"
diff --git a/vdo/batchProcessor.h b/vdo/batchProcessor.h
index aa3f2719..eceb8962 100644
--- a/vdo/batchProcessor.h
+++ b/vdo/batchProcessor.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/batchProcessor.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/batchProcessor.h#6 $
  */
 
 #ifndef BATCHPROCESSOR_H
diff --git a/vdo/bio.c b/vdo/bio.c
index 70f7a7d0..67cdfd8e 100644
--- a/vdo/bio.c
+++ b/vdo/bio.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/bio.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/bio.c#27 $
  */
 
 #include "bio.h"
@@ -40,8 +40,10 @@ void vdo_bio_copy_data_in(struct bio *bio, char *data_ptr)
 {
 	struct bio_vec biovec;
 	struct bvec_iter iter;
+// XXX workaround for LINUX_VERSION_CODE < KERNEL_VERSION(5,15,0)
+#ifdef __LINUX_BVEC_ITER_H
 	unsigned long flags;
-
+	
 	bio_for_each_segment(biovec, bio, iter) {
 		void *from = bvec_kmap_irq(&biovec, &flags);
 
@@ -49,6 +51,13 @@ void vdo_bio_copy_data_in(struct bio *bio, char *data_ptr)
 		data_ptr += biovec.bv_len;
 		bvec_kunmap_irq(from, &flags);
 	}
+#else
+
+	bio_for_each_segment(biovec, bio, iter) {
+		memcpy_from_bvec(data_ptr, &biovec);
+		data_ptr += biovec.bv_len;
+	}
+#endif
 }
 
 /**********************************************************************/
@@ -56,6 +65,8 @@ void vdo_bio_copy_data_out(struct bio *bio, char *data_ptr)
 {
 	struct bio_vec biovec;
 	struct bvec_iter iter;
+// XXX workaround for LINUX_VERSION_CODE < KERNEL_VERSION(5,15,0)
+#ifdef __LINUX_BVEC_ITER_H
 	unsigned long flags;
 
 	bio_for_each_segment(biovec, bio, iter) {
@@ -66,6 +77,13 @@ void vdo_bio_copy_data_out(struct bio *bio, char *data_ptr)
 		flush_dcache_page(biovec.bv_page);
 		bvec_kunmap_irq(dest, &flags);
 	}
+#else
+
+	bio_for_each_segment(biovec, bio, iter) {
+		memcpy_to_bvec(&biovec, data_ptr);
+		data_ptr += biovec.bv_len;
+	}
+#endif
 }
 
 /**********************************************************************/
@@ -224,7 +242,6 @@ int vdo_reset_bio_with_buffer(struct bio *bio,
 				   offset_in_page(data));
 
 	if (bytes_added != VDO_BLOCK_SIZE) {
-		vdo_free_bio(bio);
 		return uds_log_error_strerror(VDO_BIO_CREATION_FAILED,
 					      "Could only add %i bytes to bio",
 					      bytes_added);
@@ -245,7 +262,6 @@ int vdo_reset_bio_with_buffer(struct bio *bio,
 		bytes_added = bio_add_page(bio, page, bytes, offset);
 
 		if (bytes_added != bytes) {
-			vdo_free_bio(bio);
 			return uds_log_error_strerror(VDO_BIO_CREATION_FAILED,
 						      "Could only add %i bytes to bio",
 						      bytes_added);
diff --git a/vdo/bio.h b/vdo/bio.h
index 2b3a31c8..d1c01ac6 100644
--- a/vdo/bio.h
+++ b/vdo/bio.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/bio.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/bio.h#9 $
  */
 
 #ifndef BIO_H
diff --git a/vdo/blockAllocator.c b/vdo/blockAllocator.c
index c39fff4f..04f7d5f6 100644
--- a/vdo/blockAllocator.c
+++ b/vdo/blockAllocator.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockAllocator.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockAllocator.c#34 $
  */
 
 #include "blockAllocatorInternals.h"
diff --git a/vdo/blockAllocator.h b/vdo/blockAllocator.h
index 7834760f..ea95c855 100644
--- a/vdo/blockAllocator.h
+++ b/vdo/blockAllocator.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockAllocator.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockAllocator.h#6 $
  */
 
 #ifndef BLOCK_ALLOCATOR_H
diff --git a/vdo/blockAllocatorInternals.h b/vdo/blockAllocatorInternals.h
index cdede8b8..390e1ec6 100644
--- a/vdo/blockAllocatorInternals.h
+++ b/vdo/blockAllocatorInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockAllocatorInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockAllocatorInternals.h#3 $
  */
 
 #ifndef BLOCK_ALLOCATOR_INTERNALS_H
diff --git a/vdo/blockMap.c b/vdo/blockMap.c
index c206deb5..f0ee71d4 100644
--- a/vdo/blockMap.c
+++ b/vdo/blockMap.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockMap.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockMap.c#32 $
  */
 
 #include "blockMap.h"
diff --git a/vdo/blockMap.h b/vdo/blockMap.h
index 2ae59593..e09c0d96 100644
--- a/vdo/blockMap.h
+++ b/vdo/blockMap.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockMap.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockMap.h#8 $
  */
 
 #ifndef BLOCK_MAP_H
diff --git a/vdo/blockMapEntry.h b/vdo/blockMapEntry.h
index 5aa33ab9..fb79484a 100644
--- a/vdo/blockMapEntry.h
+++ b/vdo/blockMapEntry.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockMapEntry.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockMapEntry.h#8 $
  */
 
 #ifndef BLOCK_MAP_ENTRY_H
diff --git a/vdo/blockMapFormat.c b/vdo/blockMapFormat.c
index 90dc0bc1..5f3cbfa6 100644
--- a/vdo/blockMapFormat.c
+++ b/vdo/blockMapFormat.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockMapFormat.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockMapFormat.c#8 $
  */
 
 #include "blockMapFormat.h"
diff --git a/vdo/blockMapFormat.h b/vdo/blockMapFormat.h
index 83816bf7..c6f99d4e 100644
--- a/vdo/blockMapFormat.h
+++ b/vdo/blockMapFormat.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockMapFormat.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockMapFormat.h#5 $
  */
 
 #ifndef BLOCK_MAP_FORMAT_H
diff --git a/vdo/blockMapInternals.h b/vdo/blockMapInternals.h
index fbbf70a4..f164ebd6 100644
--- a/vdo/blockMapInternals.h
+++ b/vdo/blockMapInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockMapInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockMapInternals.h#4 $
  */
 
 #ifndef BLOCK_MAP_INTERNALS_H
diff --git a/vdo/blockMapPage.c b/vdo/blockMapPage.c
index 657a0f32..26ade6dc 100644
--- a/vdo/blockMapPage.c
+++ b/vdo/blockMapPage.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockMapPage.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockMapPage.c#9 $
  */
 
 #include "blockMapPage.h"
diff --git a/vdo/blockMapPage.h b/vdo/blockMapPage.h
index 6172c981..8ffbcba4 100644
--- a/vdo/blockMapPage.h
+++ b/vdo/blockMapPage.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockMapPage.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockMapPage.h#7 $
  */
 
 #ifndef BLOCK_MAP_PAGE_H
diff --git a/vdo/blockMapRecovery.c b/vdo/blockMapRecovery.c
index 43b935d5..3cf5e456 100644
--- a/vdo/blockMapRecovery.c
+++ b/vdo/blockMapRecovery.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockMapRecovery.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockMapRecovery.c#23 $
  */
 
 #include "blockMapRecovery.h"
diff --git a/vdo/blockMapRecovery.h b/vdo/blockMapRecovery.h
index c887ddb6..53cf7ea9 100644
--- a/vdo/blockMapRecovery.h
+++ b/vdo/blockMapRecovery.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockMapRecovery.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockMapRecovery.h#5 $
  */
 
 #ifndef BLOCK_MAP_RECOVERY_H
diff --git a/vdo/blockMapTree.c b/vdo/blockMapTree.c
index 1013316d..6471eff0 100644
--- a/vdo/blockMapTree.c
+++ b/vdo/blockMapTree.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockMapTree.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockMapTree.c#38 $
  */
 
 #include "blockMapTree.h"
diff --git a/vdo/blockMapTree.h b/vdo/blockMapTree.h
index c9c53a18..7acba11d 100644
--- a/vdo/blockMapTree.h
+++ b/vdo/blockMapTree.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockMapTree.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockMapTree.h#8 $
  */
 
 #ifndef BLOCK_MAP_TREE_H
diff --git a/vdo/blockMapTreeInternals.h b/vdo/blockMapTreeInternals.h
index 48c05c7a..02afc92e 100644
--- a/vdo/blockMapTreeInternals.h
+++ b/vdo/blockMapTreeInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockMapTreeInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockMapTreeInternals.h#4 $
  */
 
 #ifndef BLOCK_MAP_TREE_INTERNALS_H
diff --git a/vdo/blockMappingState.h b/vdo/blockMappingState.h
index 7fea6e34..c5f2b62c 100644
--- a/vdo/blockMappingState.h
+++ b/vdo/blockMappingState.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/blockMappingState.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/blockMappingState.h#7 $
  */
 
 #ifndef BLOCK_MAPPING_STATE_H
diff --git a/vdo/bufferPool.c b/vdo/bufferPool.c
index 1c33c2a2..959f4428 100644
--- a/vdo/bufferPool.c
+++ b/vdo/bufferPool.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/bufferPool.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/bufferPool.c#9 $
  */
 
 #include "bufferPool.h"
diff --git a/vdo/bufferPool.h b/vdo/bufferPool.h
index 88c7872e..bb8fbcdd 100644
--- a/vdo/bufferPool.h
+++ b/vdo/bufferPool.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/bufferPool.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/bufferPool.h#5 $
  */
 #ifndef BUFFERPOOL_H
 #define BUFFERPOOL_H
diff --git a/vdo/checksum.h b/vdo/checksum.h
index 500af207..3b6a7179 100644
--- a/vdo/checksum.h
+++ b/vdo/checksum.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/checksum.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/checksum.h#7 $
  */
 
 #ifndef CHECKSUM_H
diff --git a/vdo/completion.c b/vdo/completion.c
index 61f11815..32f72bfd 100644
--- a/vdo/completion.c
+++ b/vdo/completion.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/completion.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/completion.c#17 $
  */
 
 #include "completion.h"
diff --git a/vdo/completion.h b/vdo/completion.h
index 5ea22bdf..07a8c9b5 100644
--- a/vdo/completion.h
+++ b/vdo/completion.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/completion.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/completion.h#15 $
  */
 
 #ifndef COMPLETION_H
diff --git a/vdo/compressedBlock.c b/vdo/compressedBlock.c
index 8ca9d16e..20c334d6 100644
--- a/vdo/compressedBlock.c
+++ b/vdo/compressedBlock.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/compressedBlock.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/compressedBlock.c#8 $
  */
 
 #include "compressedBlock.h"
diff --git a/vdo/compressedBlock.h b/vdo/compressedBlock.h
index 4814388a..beaaa445 100644
--- a/vdo/compressedBlock.h
+++ b/vdo/compressedBlock.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/compressedBlock.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/compressedBlock.h#6 $
  */
 
 #ifndef COMPRESSED_BLOCK_H
diff --git a/vdo/compressionState.c b/vdo/compressionState.c
index 254f2cf0..83ac1117 100644
--- a/vdo/compressionState.c
+++ b/vdo/compressionState.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/compressionState.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/compressionState.c#15 $
  */
 
 #include "compressionState.h"
diff --git a/vdo/compressionState.h b/vdo/compressionState.h
index 17d05953..c5150ce4 100644
--- a/vdo/compressionState.h
+++ b/vdo/compressionState.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/compressionState.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/compressionState.h#9 $
  */
 
 #ifndef COMPRESSION_STATE_H
diff --git a/vdo/constants.c b/vdo/constants.c
index d5aedbeb..b30f6e3f 100644
--- a/vdo/constants.c
+++ b/vdo/constants.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/constants.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/constants.c#3 $
  */
 
 #include "types.h"
diff --git a/vdo/constants.h b/vdo/constants.h
index 4060f4d1..1d69251f 100644
--- a/vdo/constants.h
+++ b/vdo/constants.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/constants.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/constants.h#5 $
  */
 
 #ifndef CONSTANTS_H
diff --git a/vdo/dataKVIO.c b/vdo/dataKVIO.c
index 02973468..6d1c8694 100644
--- a/vdo/dataKVIO.c
+++ b/vdo/dataKVIO.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/dataKVIO.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/dataKVIO.c#47 $
  */
 
 #include "dataKVIO.h"
diff --git a/vdo/dataKVIO.h b/vdo/dataKVIO.h
index 441431fe..350c46d2 100644
--- a/vdo/dataKVIO.h
+++ b/vdo/dataKVIO.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/dataKVIO.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/dataKVIO.h#18 $
  */
 
 #ifndef DATA_KVIO_H
diff --git a/vdo/dataVIO.c b/vdo/dataVIO.c
index a385f969..03e7c5e6 100644
--- a/vdo/dataVIO.c
+++ b/vdo/dataVIO.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/dataVIO.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/dataVIO.c#31 $
  */
 
 #include "dataVIO.h"
diff --git a/vdo/dataVIO.h b/vdo/dataVIO.h
index 5bcf7ac6..4758983c 100644
--- a/vdo/dataVIO.h
+++ b/vdo/dataVIO.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/dataVIO.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/dataVIO.h#38 $
  */
 
 #ifndef DATA_VIO_H
diff --git a/vdo/deadlockQueue.c b/vdo/deadlockQueue.c
index 215ca1b5..2d3b733a 100644
--- a/vdo/deadlockQueue.c
+++ b/vdo/deadlockQueue.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/deadlockQueue.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/deadlockQueue.c#3 $
  */
 
 #include "deadlockQueue.h"
diff --git a/vdo/deadlockQueue.h b/vdo/deadlockQueue.h
index 63c6366a..5bd504ac 100644
--- a/vdo/deadlockQueue.h
+++ b/vdo/deadlockQueue.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/deadlockQueue.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/deadlockQueue.h#3 $
  */
 
 #ifndef DEADLOCK_QUEUE_H
diff --git a/vdo/dedupeIndex.c b/vdo/dedupeIndex.c
index 972bc61d..01d46352 100644
--- a/vdo/dedupeIndex.c
+++ b/vdo/dedupeIndex.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/dedupeIndex.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/dedupeIndex.c#39 $
  */
 
 #include "dedupeIndex.h"
@@ -707,7 +707,9 @@ void suspend_vdo_dedupe_index(struct dedupe_index *index, bool save_flag)
 }
 
 /**********************************************************************/
-void resume_vdo_dedupe_index(struct dedupe_index *index)
+void resume_vdo_dedupe_index(struct dedupe_index *index,
+			     bool dedupe,
+			     bool create)
 {
 	int result = uds_resume_index_session(index->index_session);
 	if (result != UDS_SUCCESS) {
@@ -716,6 +718,18 @@ void resume_vdo_dedupe_index(struct dedupe_index *index)
 
 	spin_lock(&index->state_lock);
 	index->suspended = false;
+
+	if (dedupe) {
+		index->index_target = IS_OPENED;
+		index->dedupe_flag = true;
+	} else {
+		index->index_target = IS_CLOSED;
+	}
+
+	if (create) {
+		index->create_flag = true;
+	}
+
 	launch_dedupe_state_change(index);
 	spin_unlock(&index->state_lock);
 }
@@ -836,6 +850,13 @@ int message_vdo_dedupe_index(struct dedupe_index *index, const char *name)
 	return -EINVAL;
 }
 
+/**********************************************************************/
+int add_vdo_dedupe_index_sysfs(struct dedupe_index *index,
+			       struct kobject *parent)
+{
+	return kobject_add(&index->dedupe_directory, parent, "dedupe");
+}
+
 /**********************************************************************/
 void start_vdo_dedupe_index(struct dedupe_index *index, bool create_flag)
 {
@@ -992,7 +1013,6 @@ int make_vdo_dedupe_index(struct dedupe_index **index_ptr,
 
 	result = make_work_queue(thread_name_prefix,
 				 "dedupeQ",
-				 &vdo->work_queue_directory,
 				 vdo,
 				 index,
 				 &uds_queue_type,
@@ -1010,18 +1030,6 @@ int make_vdo_dedupe_index(struct dedupe_index **index_ptr,
 	}
 
 	kobject_init(&index->dedupe_directory, &dedupe_directory_type);
-	result = kobject_add(&index->dedupe_directory,
-			     &vdo->vdo_directory,
-			     "dedupe");
-	if (result != VDO_SUCCESS) {
-		free_work_queue(UDS_FORGET(index->uds_queue));
-		uds_destroy_index_session(index->index_session);
-		uds_free_configuration(index->configuration);
-		UDS_FREE(index->index_name);
-		UDS_FREE(index);
-		return result;
-	}
-
 	INIT_LIST_HEAD(&index->pending_head);
 	spin_lock_init(&index->pending_lock);
 	spin_lock_init(&index->state_lock);
diff --git a/vdo/dedupeIndex.h b/vdo/dedupeIndex.h
index 8e7bd1cf..417a03d4 100644
--- a/vdo/dedupeIndex.h
+++ b/vdo/dedupeIndex.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/dedupeIndex.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/dedupeIndex.h#15 $
  */
 
 #ifndef DEDUPE_INDEX_H
@@ -150,6 +150,17 @@ static inline void update_vdo_dedupe_advice(struct data_vio *data_vio)
 	enqueue_vdo_index_operation(data_vio, UDS_UPDATE);
 }
 
+/**
+ * Add the sysfs nodes for the dedupe index.
+ *
+ * @param index        The dedupe index
+ * @param parent  The kobject to attach the sysfs nodes to
+ *
+ * @return 0 or an error code
+ **/
+int add_vdo_dedupe_index_sysfs(struct dedupe_index *index,
+			       struct kobject *parent);
+
 /**
  * Start the dedupe index.
  *
@@ -179,9 +190,13 @@ void suspend_vdo_dedupe_index(struct dedupe_index *index, bool save_flag);
 /**
  * Resume a suspended dedupe index. May be called from any thread.
  *
- * @param index  The dedupe index
+ * @param index   The dedupe index
+ * @param dedupe  Whether dedupe should be on or off.
+ * @param create  Whether to create the index or not.
  **/
-void resume_vdo_dedupe_index(struct dedupe_index *index);
+void resume_vdo_dedupe_index(struct dedupe_index *index,
+			     bool dedupe,
+			     bool create);
 
 /**
  * Finish the dedupe index.
diff --git a/vdo/deviceConfig.c b/vdo/deviceConfig.c
index 7e0a531e..0f495089 100644
--- a/vdo/deviceConfig.c
+++ b/vdo/deviceConfig.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/deviceConfig.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/deviceConfig.c#19 $
  */
 
 #include "deviceConfig.h"
@@ -364,6 +364,10 @@ static int parse_one_key_value_pair(const char *key,
 		return parse_bool(value, "on", "off", &config->deduplication);
 	}
 
+	if (strcmp(key, "compression") == 0) {
+		return parse_bool(value, "on", "off", &config->compression);
+	}
+
 	// The remaining arguments must have integral values.
 	result = vdo_string_to_uint(value, &count);
 	if (result != UDS_SUCCESS) {
@@ -526,6 +530,7 @@ int parse_vdo_device_config(int argc,
 	};
 	config->max_discard_blocks = 1;
 	config->deduplication = true;
+	config->compression = false;
 
 	arg_set.argc = argc;
 	arg_set.argv = argv;
diff --git a/vdo/deviceConfig.h b/vdo/deviceConfig.h
index 529049fc..d5881f77 100644
--- a/vdo/deviceConfig.h
+++ b/vdo/deviceConfig.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/deviceConfig.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/deviceConfig.h#11 $
  */
 #ifndef DEVICE_CONFIG_H
 #define DEVICE_CONFIG_H
@@ -56,6 +56,7 @@ struct device_config {
 	unsigned int cache_size;
 	unsigned int block_map_maximum_age;
 	bool deduplication;
+	bool compression;
 	struct thread_count_config thread_counts;
 	block_count_t max_discard_blocks;
 };
diff --git a/vdo/deviceRegistry.c b/vdo/deviceRegistry.c
index 084c5dad..d338413b 100644
--- a/vdo/deviceRegistry.c
+++ b/vdo/deviceRegistry.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/deviceRegistry.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/deviceRegistry.c#9 $
  */
 
 #include "deviceRegistry.h"
diff --git a/vdo/deviceRegistry.h b/vdo/deviceRegistry.h
index b7ec15b7..637fd429 100644
--- a/vdo/deviceRegistry.h
+++ b/vdo/deviceRegistry.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/deviceRegistry.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/deviceRegistry.h#6 $
  */
 
 #ifndef DEVICE_REGISTRY_H
diff --git a/vdo/dirtyLists.c b/vdo/dirtyLists.c
index a7dc4be2..b2bd17ec 100644
--- a/vdo/dirtyLists.c
+++ b/vdo/dirtyLists.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/dirtyLists.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/dirtyLists.c#7 $
  */
 
 #include "dirtyLists.h"
diff --git a/vdo/dirtyLists.h b/vdo/dirtyLists.h
index 38cdf4c8..fcc5e97a 100644
--- a/vdo/dirtyLists.h
+++ b/vdo/dirtyLists.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/dirtyLists.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/dirtyLists.h#6 $
  */
 
 #ifndef DIRTY_LISTS_H
diff --git a/vdo/dmvdo.c b/vdo/dmvdo.c
index 555c8eb5..5745883a 100644
--- a/vdo/dmvdo.c
+++ b/vdo/dmvdo.c
@@ -16,11 +16,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/dmvdo.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/dmvdo.c#54 $
  */
 
 #include "dmvdo.h"
 
+#include <linux/bvec.h>
 #include <linux/module.h>
 
 #include "logger.h"
@@ -197,6 +198,14 @@ static void vdo_status(struct dm_target *ti,
 		device_config = (struct device_config *) ti->private;
 		DMEMIT("%s", device_config->original_string);
 		break;
+// XXX workaround for LINUX_VERSION_CODE >= KERNEL_VERSION(5,15,0)
+#ifndef __LINUX_BVEC_ITER_H
+	// XXX We ought to print more detailed output here, but this is what
+	// thin does.
+	case STATUSTYPE_IMA:
+		*result = '\0';
+		break;
+#endif // 5.15+
 	}
 }
 
@@ -415,6 +424,9 @@ static int vdo_initialize(struct dm_target *ti,
 		      config->block_map_maximum_age);
 	uds_log_debug("Deduplication          = %s",
 		      (config->deduplication ? "on" : "off"));
+	uds_log_debug("Compression            = %s",
+		      (config->compression ? "on" : "off"));
+
 
 	vdo = find_vdo_matching(vdo_uses_device, config);
 	if (vdo != NULL) {
@@ -710,7 +722,7 @@ static void vdo_resume(struct dm_target *ti)
 static struct target_type vdo_target_bio = {
 	.features = DM_TARGET_SINGLETON,
 	.name = "vdo",
-	.version = { 6, 2, 3 },
+	.version = { 8, 1, 0 },
 	.module = THIS_MODULE,
 	.ctr = vdo_ctr,
 	.dtr = vdo_dtr,
diff --git a/vdo/dmvdo.h b/vdo/dmvdo.h
index d3943027..06c9c45c 100644
--- a/vdo/dmvdo.h
+++ b/vdo/dmvdo.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/dmvdo.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/dmvdo.h#3 $
  */
 
 #ifndef DMVDO_H
diff --git a/vdo/dump.c b/vdo/dump.c
index f29acf66..dd6081e1 100644
--- a/vdo/dump.c
+++ b/vdo/dump.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/dump.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/dump.c#25 $
  */
 
 #include "dump.h"
diff --git a/vdo/dump.h b/vdo/dump.h
index e0c8ee19..d423f2a5 100644
--- a/vdo/dump.h
+++ b/vdo/dump.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/dump.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/dump.h#8 $
  */
 
 #ifndef DUMP_H
diff --git a/vdo/extent.c b/vdo/extent.c
index bcaf8a63..abd1d17d 100644
--- a/vdo/extent.c
+++ b/vdo/extent.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/extent.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/extent.c#10 $
  */
 
 #include "extent.h"
diff --git a/vdo/extent.h b/vdo/extent.h
index 469e86f1..e095f8e9 100644
--- a/vdo/extent.h
+++ b/vdo/extent.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/extent.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/extent.h#5 $
  */
 
 #ifndef EXTENT_H
diff --git a/vdo/fixedLayout.c b/vdo/fixedLayout.c
index 3e7ee504..06fdc0c5 100644
--- a/vdo/fixedLayout.c
+++ b/vdo/fixedLayout.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/fixedLayout.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/fixedLayout.c#13 $
  */
 
 #include "fixedLayout.h"
diff --git a/vdo/fixedLayout.h b/vdo/fixedLayout.h
index 54de882c..57c339cf 100644
--- a/vdo/fixedLayout.h
+++ b/vdo/fixedLayout.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/fixedLayout.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/fixedLayout.h#7 $
  */
 
 #ifndef FIXED_LAYOUT_H
diff --git a/vdo/flush.c b/vdo/flush.c
index b5c4cfdc..a608ae23 100644
--- a/vdo/flush.c
+++ b/vdo/flush.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/flush.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/flush.c#37 $
  */
 
 #include "flush.h"
@@ -29,6 +29,7 @@
 #include "kernelLayer.h"
 #include "kernelVDO.h"
 
+#include "adminState.h"
 #include "blockAllocator.h"
 #include "completion.h"
 #include "logicalZone.h"
@@ -41,6 +42,8 @@ struct flusher {
 	struct vdo_completion completion;
 	/** The vdo to which this flusher belongs */
 	struct vdo *vdo;
+	/** The administrative state of the flusher */
+	struct admin_state state;
 	/** The current flush generation of the vdo */
 	sequence_number_t flush_generation;
 	/** The first unacknowledged flush generation */
@@ -65,6 +68,20 @@ struct flusher {
 	uint64_t flush_arrival_jiffies;
 };
 
+/**
+ * Check that we are on the flusher thread.
+ *
+ * @param flusher  The flusher
+ * @param caller   The function which is asserting
+ **/
+static inline void assert_on_flusher_thread(struct flusher *flusher,
+					    const char *caller)
+{
+	ASSERT_LOG_ONLY((vdo_get_callback_thread_id() == flusher->thread_id),
+			"%s() called from flusher thread",
+			caller);
+}
+
 /**
  * Convert a generic vdo_completion to a flusher.
  *
@@ -101,6 +118,8 @@ int make_vdo_flusher(struct vdo *vdo)
 
 	vdo->flusher->vdo = vdo;
 	vdo->flusher->thread_id = vdo->thread_config->packer_thread;
+	set_vdo_admin_state_code(&vdo->flusher->state,
+				 VDO_ADMIN_STATE_NORMAL_OPERATION);
 	initialize_vdo_completion(&vdo->flusher->completion, vdo,
 				  VDO_FLUSH_NOTIFICATION_COMPLETION);
 
@@ -143,10 +162,9 @@ static void finish_notification(struct vdo_completion *completion)
 {
 	struct waiter *waiter;
 	int result;
-
 	struct flusher *flusher = as_flusher(completion);
-	ASSERT_LOG_ONLY((vdo_get_callback_thread_id() == flusher->thread_id),
-			"finish_notification() called from flusher thread");
+
+	assert_on_flusher_thread(flusher, __func__);
 
 	waiter = dequeue_next_waiter(&flusher->notifiers);
 	result = enqueue_waiter(&flusher->pending_flushes, waiter);
@@ -240,8 +258,7 @@ void flush_vdo(struct vdo_work_item *item)
 	bool may_notify;
 	int result;
 
-	ASSERT_LOG_ONLY((vdo_get_callback_thread_id() == flusher->thread_id),
-			"flush_vdo() called from flusher thread");
+	assert_on_flusher_thread(flusher, __func__);
 
 	flush->flush_generation = flusher->flush_generation++;
 	may_notify = !has_waiters(&flusher->notifiers);
@@ -259,14 +276,36 @@ void flush_vdo(struct vdo_work_item *item)
 	}
 }
 
+/**
+ * Check whether the flusher has drained.
+ *
+ * @param flusher  The flusher
+ **/
+static void check_for_drain_complete(struct flusher *flusher)
+{
+	bool drained = true;
+
+	if (!is_vdo_state_draining(&flusher->state)
+	    || has_waiters(&flusher->pending_flushes)) {
+		return;
+	}
+
+	spin_lock(&flusher->lock);
+	drained = bio_list_empty(&flusher->waiting_flush_bios);
+	spin_unlock(&flusher->lock);
+
+	if (drained) {
+		finish_vdo_draining(&flusher->state);
+	}
+}
+
 /**********************************************************************/
 void complete_vdo_flushes(struct flusher *flusher)
 {
 	sequence_number_t oldest_active_generation = UINT64_MAX;
 	struct logical_zone *zone;
 
-	ASSERT_LOG_ONLY((vdo_get_callback_thread_id() == flusher->thread_id),
-			"complete_vdo_flushes() called from flusher thread");
+	assert_on_flusher_thread(flusher, __func__);
 
 	for (zone = get_vdo_logical_zone(flusher->vdo->logical_zones, 0);
 	     zone != NULL; zone = get_next_vdo_logical_zone(zone)) {
@@ -292,6 +331,8 @@ void complete_vdo_flushes(struct flusher *flusher)
 		vdo_complete_flush(flush);
 		flusher->first_unacknowledged_generation++;
 	}
+
+	check_for_drain_complete(flusher);
 }
 
 /**********************************************************************/
@@ -463,3 +504,33 @@ void vdo_complete_flush(struct vdo_flush *flush)
 			BIO_Q_ACTION_FLUSH);
 	vdo_enqueue_bio_work_item(flush->vdo->io_submitter, &flush->work_item);
 }
+
+
+/**
+ * Initiate a drain.
+ *
+ * Implements vdo_admin_initiator.
+ **/
+static void initiate_drain(struct admin_state *state)
+{
+	check_for_drain_complete(container_of(state, struct flusher, state));
+}
+
+/**********************************************************************/
+void vdo_drain_flusher(struct flusher *flusher,
+		       struct vdo_completion *completion)
+{
+	assert_on_flusher_thread(flusher, __func__);
+	start_vdo_draining(&flusher->state,
+			   VDO_ADMIN_STATE_SUSPENDING,
+			   completion,
+			   initiate_drain);
+}
+
+/**********************************************************************/
+void vdo_resume_flusher(struct flusher *flusher, struct vdo_completion *parent)
+{
+	assert_on_flusher_thread(flusher, __func__);
+	finish_vdo_completion(parent,
+			      resume_vdo_if_quiescent(&flusher->state));
+}
diff --git a/vdo/flush.h b/vdo/flush.h
index da058f09..c8abd9cd 100644
--- a/vdo/flush.h
+++ b/vdo/flush.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/flush.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/flush.h#11 $
  */
 
 #ifndef FLUSH_H
@@ -109,4 +109,23 @@ void vdo_complete_flush(struct vdo_flush *flush);
  **/
 void launch_vdo_flush(struct vdo *vdo, struct bio *bio);
 
+/**
+ * Drain the flusher by preventing any more VIOs from entering the flusher and
+ * then flushing. The flusher will be left in the suspended state.
+ *
+ * @param flusher     The flusher to drain
+ * @param completion  The completion to finish when the flusher has drained
+ **/
+void vdo_drain_flusher(struct flusher *flusher,
+		       struct vdo_completion *completion);
+
+/**
+ * Resume a flusher which has been suspended.
+ *
+ * @param flusher  The flusher to resume
+ * @param parent   The completion to finish when the flusher has resumed
+ **/
+void vdo_resume_flusher(struct flusher *flusher,
+			struct vdo_completion *parent);
+
 #endif /* FLUSH_H */
diff --git a/vdo/forest.c b/vdo/forest.c
index 1d8f2a93..131a57fa 100644
--- a/vdo/forest.c
+++ b/vdo/forest.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/forest.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/forest.c#17 $
  */
 
 #include "forest.h"
diff --git a/vdo/forest.h b/vdo/forest.h
index 642c0546..acc0c94c 100644
--- a/vdo/forest.h
+++ b/vdo/forest.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/forest.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/forest.h#5 $
  */
 
 #ifndef FOREST_H
diff --git a/vdo/hashLock.c b/vdo/hashLock.c
index a21ccbea..a052669c 100644
--- a/vdo/hashLock.c
+++ b/vdo/hashLock.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/hashLock.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/hashLock.c#30 $
  */
 
 /**
diff --git a/vdo/hashLock.h b/vdo/hashLock.h
index 7eb2ba28..4bbd71bb 100644
--- a/vdo/hashLock.h
+++ b/vdo/hashLock.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/hashLock.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/hashLock.h#5 $
  */
 
 #ifndef HASH_LOCK_H
diff --git a/vdo/hashLockInternals.h b/vdo/hashLockInternals.h
index 0a0a4a6f..ac10f642 100644
--- a/vdo/hashLockInternals.h
+++ b/vdo/hashLockInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/hashLockInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/hashLockInternals.h#4 $
  */
 
 #ifndef HASH_LOCK_INTERNALS_H
diff --git a/vdo/hashZone.c b/vdo/hashZone.c
index c5fd8e0a..2aed1013 100644
--- a/vdo/hashZone.c
+++ b/vdo/hashZone.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/hashZone.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/hashZone.c#20 $
  */
 
 #include "hashZone.h"
diff --git a/vdo/hashZone.h b/vdo/hashZone.h
index 23813948..6d0a1114 100644
--- a/vdo/hashZone.h
+++ b/vdo/hashZone.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/hashZone.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/hashZone.h#8 $
  */
 
 #ifndef HASH_ZONE_H
diff --git a/vdo/header.c b/vdo/header.c
index 1ad6bac7..1deb06b4 100644
--- a/vdo/header.c
+++ b/vdo/header.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/header.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/header.c#6 $
  */
 
 #include "header.h"
diff --git a/vdo/header.h b/vdo/header.h
index 14eec388..0c985cb7 100644
--- a/vdo/header.h
+++ b/vdo/header.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/header.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/header.h#4 $
  */
 
 #ifndef HEADER_H
diff --git a/vdo/heap.c b/vdo/heap.c
index f6b5c939..795f4bb7 100644
--- a/vdo/heap.c
+++ b/vdo/heap.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/heap.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/heap.c#6 $
  */
 
 #include "heap.h"
diff --git a/vdo/heap.h b/vdo/heap.h
index 13b2748f..2cc064e3 100644
--- a/vdo/heap.h
+++ b/vdo/heap.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/heap.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/heap.h#3 $
  */
 
 #ifndef HEAP_H
diff --git a/vdo/histogram.c b/vdo/histogram.c
index 6ede229c..7f40b20a 100644
--- a/vdo/histogram.c
+++ b/vdo/histogram.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/histogram.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/histogram.c#7 $
  */
 
 #include <linux/kobject.h>
diff --git a/vdo/histogram.h b/vdo/histogram.h
index ceec85b5..1de8c7d4 100644
--- a/vdo/histogram.h
+++ b/vdo/histogram.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/histogram.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/histogram.h#3 $
  */
 
 #ifndef HISTOGRAM_H
diff --git a/vdo/instanceNumber.c b/vdo/instanceNumber.c
index c764747c..307eb4b8 100644
--- a/vdo/instanceNumber.c
+++ b/vdo/instanceNumber.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/instanceNumber.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/instanceNumber.c#7 $
  */
 
 #include "instanceNumber.h"
diff --git a/vdo/instanceNumber.h b/vdo/instanceNumber.h
index f97bb218..8df8a34d 100644
--- a/vdo/instanceNumber.h
+++ b/vdo/instanceNumber.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/instanceNumber.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/instanceNumber.h#5 $
  */
 
 #ifndef INSTANCE_NUMBER_H
diff --git a/vdo/intMap.c b/vdo/intMap.c
index e89b7cf4..e7aa6d35 100644
--- a/vdo/intMap.c
+++ b/vdo/intMap.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/intMap.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/intMap.c#9 $
  */
 
 /**
diff --git a/vdo/intMap.h b/vdo/intMap.h
index a03b297f..d1513d79 100644
--- a/vdo/intMap.h
+++ b/vdo/intMap.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/intMap.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/intMap.h#5 $
  */
 
 #ifndef INT_MAP_H
diff --git a/vdo/ioSubmitter.c b/vdo/ioSubmitter.c
index b4e571ab..cd07d05d 100644
--- a/vdo/ioSubmitter.c
+++ b/vdo/ioSubmitter.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/ioSubmitter.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/ioSubmitter.c#32 $
  */
 
 #include "ioSubmitter.h"
@@ -305,25 +305,22 @@ static void process_bio_map(struct vdo_work_item *item)
  *
  * @param map         The bio map to use for merging
  * @param vio         The vio we want to merge
- * @param merge_type  The type of merging we want to try
+ * @param back_merge  Set to true for a back merge, false for a front merge
  *
  * @return the vio to merge to, NULL if no merging is possible
  */
 static struct vio *get_mergeable_locked(struct int_map *map,
 					struct vio *vio,
-					unsigned int merge_type)
+					bool back_merge)
 {
 	struct bio *bio = vio->bio;
 	sector_t merge_sector = get_bio_sector(bio);
 	struct vio *vio_merge;
 
-	switch (merge_type) {
-	case ELEVATOR_BACK_MERGE:
+	if (back_merge) {
 		merge_sector -= VDO_SECTORS_PER_BLOCK;
-		break;
-	case ELEVATOR_FRONT_MERGE:
+        } else {
 		merge_sector += VDO_SECTORS_PER_BLOCK;
-		break;
 	}
 
 	vio_merge = int_map_get(map, merge_sector);
@@ -345,20 +342,14 @@ static struct vio *get_mergeable_locked(struct int_map *map,
 		return NULL;
 	}
 
-	switch (merge_type) {
-	case ELEVATOR_BACK_MERGE:
+	if (back_merge) {
 		if (get_bio_sector(vio_merge->bios_merged.tail) !=
 		    merge_sector) {
 			return NULL;
 		}
-		break;
-
-	case ELEVATOR_FRONT_MERGE:
-		if (get_bio_sector(vio_merge->bios_merged.head) !=
+        } else if (get_bio_sector(vio_merge->bios_merged.head) !=
 		    merge_sector) {
 			return NULL;
-		}
-		break;
 	}
 
 	return vio_merge;
@@ -422,10 +413,8 @@ static bool try_bio_map_merge(struct bio_queue_data *bio_queue_data,
 	struct vio *prev_vio, *next_vio;
 
 	mutex_lock(&bio_queue_data->lock);
-	prev_vio = get_mergeable_locked(bio_queue_data->map, vio,
-					ELEVATOR_BACK_MERGE);
-	next_vio = get_mergeable_locked(bio_queue_data->map, vio,
-				        ELEVATOR_FRONT_MERGE);
+	prev_vio = get_mergeable_locked(bio_queue_data->map, vio, true);
+	next_vio = get_mergeable_locked(bio_queue_data->map, vio, false);
 	if (prev_vio == next_vio) {
 		next_vio = NULL;
 	}
@@ -507,7 +496,6 @@ static int initialize_bio_queue(struct bio_queue_data *bio_queue_data,
 
 	return make_work_queue(thread_name_prefix,
 			       queue_name,
-			       &vdo->work_queue_directory,
 			       vdo,
 			       bio_queue_data,
 			       &bio_queue_type,
diff --git a/vdo/ioSubmitter.h b/vdo/ioSubmitter.h
index 7718332e..5f540fec 100644
--- a/vdo/ioSubmitter.h
+++ b/vdo/ioSubmitter.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/ioSubmitter.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/ioSubmitter.h#12 $
  */
 
 #ifndef IOSUBMITTER_H
diff --git a/vdo/journalPoint.h b/vdo/journalPoint.h
index 7af028a2..2bdda891 100644
--- a/vdo/journalPoint.h
+++ b/vdo/journalPoint.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/journalPoint.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/journalPoint.h#5 $
  */
 
 #ifndef JOURNAL_POINT_H
diff --git a/vdo/kernelLayer.c b/vdo/kernelLayer.c
index bd1bac37..2b04d706 100644
--- a/vdo/kernelLayer.c
+++ b/vdo/kernelLayer.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/kernelLayer.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/kernelLayer.c#57 $
  */
 
 #include "kernelLayer.h"
@@ -406,7 +406,6 @@ int make_kernel_layer(unsigned int instance,
 	if (use_bio_ack_queue(&layer->vdo)) {
 		result = make_work_queue(thread_name_prefix,
 					 "ackQ",
-					 &layer->vdo.work_queue_directory,
 					 &layer->vdo,
 					 layer,
 					 &bio_ack_q_type,
@@ -423,7 +422,6 @@ int make_kernel_layer(unsigned int instance,
 	// CPU Queues
 	result = make_work_queue(thread_name_prefix,
 				 "cpuQ",
-				 &layer->vdo.work_queue_directory,
 				 &layer->vdo,
 				 layer,
 				 &cpu_q_type,
@@ -610,21 +608,9 @@ void free_kernel_layer(struct kernel_layer *layer)
 	destroy_vdo(&layer->vdo);
 }
 
-/**********************************************************************/
-static void pool_stats_release(struct kobject *directory)
-{
-	struct vdo *vdo = container_of(directory, struct vdo, stats_directory);
-	complete(&vdo->stats_shutdown);
-}
-
 /**********************************************************************/
 int start_kernel_layer(struct kernel_layer *layer, char **reason)
 {
-	static struct kobj_type stats_directory_type = {
-		.release = pool_stats_release,
-		.sysfs_ops = &vdo_pool_stats_sysfs_ops,
-		.default_attrs = vdo_pool_stats_attrs,
-	};
 	int result;
 	const struct admin_state_code *code
 		= get_vdo_admin_state_code(&layer->vdo.admin_state);
@@ -644,16 +630,6 @@ int start_kernel_layer(struct kernel_layer *layer, char **reason)
 	}
 
 	set_kernel_layer_state(layer, LAYER_RUNNING);
-	kobject_init(&layer->vdo.stats_directory, &stats_directory_type);
-	result = kobject_add(&layer->vdo.stats_directory,
-			     &layer->vdo.vdo_directory,
-			     "statistics");
-	if (result != 0) {
-		*reason = "Cannot add sysfs statistics node";
-		stop_kernel_layer(layer);
-		return result;
-	}
-	layer->vdo.stats_added = true;
 
 	if (layer->vdo.device_config->deduplication) {
 		// Don't try to load or rebuild the index first (and log
@@ -670,17 +646,6 @@ int start_kernel_layer(struct kernel_layer *layer, char **reason)
 /**********************************************************************/
 void stop_kernel_layer(struct kernel_layer *layer)
 {
-	layer->vdo.allocations_allowed = true;
-
-	// Stop services that need to gather VDO statistics from the worker
-	// threads.
-	if (layer->vdo.stats_added) {
-		layer->vdo.stats_added = false;
-		init_completion(&layer->vdo.stats_shutdown);
-		kobject_put(&layer->vdo.stats_directory);
-		wait_for_completion(&layer->vdo.stats_shutdown);
-	}
-
 	switch (get_kernel_layer_state(layer)) {
 	case LAYER_RUNNING:
 		suspend_kernel_layer(layer);
@@ -727,7 +692,9 @@ int resume_kernel_layer(struct kernel_layer *layer)
 		return VDO_SUCCESS;
 	}
 
-	resume_vdo_dedupe_index(layer->vdo.dedupe_index);
+	resume_vdo_dedupe_index(layer->vdo.dedupe_index,
+				layer->vdo.device_config->deduplication,
+				layer->vdo.load_state == VDO_NEW);
 	result = resume_vdo(&layer->vdo);
 
 	if (result != VDO_SUCCESS) {
diff --git a/vdo/kernelLayer.h b/vdo/kernelLayer.h
index 4d282f50..8045d58a 100644
--- a/vdo/kernelLayer.h
+++ b/vdo/kernelLayer.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/kernelLayer.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/kernelLayer.h#29 $
  */
 
 #ifndef KERNELLAYER_H
diff --git a/vdo/kernelTypes.h b/vdo/kernelTypes.h
index e77d28f9..23f57826 100644
--- a/vdo/kernelTypes.h
+++ b/vdo/kernelTypes.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/kernelTypes.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/kernelTypes.h#12 $
  */
 
 #ifndef KERNEL_TYPES_H
diff --git a/vdo/kernelVDO.c b/vdo/kernelVDO.c
index b7a7663e..7ef84683 100644
--- a/vdo/kernelVDO.c
+++ b/vdo/kernelVDO.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/kernelVDO.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/kernelVDO.c#36 $
  */
 
 /*
@@ -120,7 +120,6 @@ int make_vdo_threads(struct vdo *vdo,
 				    sizeof(queue_name));
 		result = make_work_queue(thread_name_prefix,
 					 queue_name,
-					 &vdo->work_queue_directory,
 					 vdo,
 					 thread,
 					 &request_queue_type,
diff --git a/vdo/kernelVDO.h b/vdo/kernelVDO.h
index e4f288d8..14c04624 100644
--- a/vdo/kernelVDO.h
+++ b/vdo/kernelVDO.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/kernelVDO.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/kernelVDO.h#18 $
  */
 
 #ifndef KERNEL_VDO_H
diff --git a/vdo/kernelVDOInternals.h b/vdo/kernelVDOInternals.h
index 252f2940..e8ae99db 100644
--- a/vdo/kernelVDOInternals.h
+++ b/vdo/kernelVDOInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/kernelVDOInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/kernelVDOInternals.h#2 $
  */
 
 #ifndef KERNEL_VDO_INTERNALS_H
diff --git a/vdo/kvio.c b/vdo/kvio.c
index ce439342..790baa7b 100644
--- a/vdo/kvio.c
+++ b/vdo/kvio.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/kvio.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/kvio.c#21 $
  */
 
 #include "kvio.h"
diff --git a/vdo/kvio.h b/vdo/kvio.h
index 46cbd175..0fb6e64f 100644
--- a/vdo/kvio.h
+++ b/vdo/kvio.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/kvio.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/kvio.h#6 $
  */
 
 #ifndef KVIO_H
diff --git a/vdo/limiter.c b/vdo/limiter.c
index cdcedc3f..a457fc2a 100644
--- a/vdo/limiter.c
+++ b/vdo/limiter.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/limiter.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/limiter.c#7 $
  */
 
 #include "limiter.h"
diff --git a/vdo/limiter.h b/vdo/limiter.h
index 37d72791..cfed4af4 100644
--- a/vdo/limiter.h
+++ b/vdo/limiter.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/limiter.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/limiter.h#7 $
  */
 
 #ifndef LIMITER_H
diff --git a/vdo/lockCounter.c b/vdo/lockCounter.c
index ff598441..cbf77839 100644
--- a/vdo/lockCounter.c
+++ b/vdo/lockCounter.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/lockCounter.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/lockCounter.c#12 $
  */
 
 #include "lockCounter.h"
diff --git a/vdo/lockCounter.h b/vdo/lockCounter.h
index 4d37249e..4c1a485d 100644
--- a/vdo/lockCounter.h
+++ b/vdo/lockCounter.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/lockCounter.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/lockCounter.h#5 $
  */
 
 #ifndef LOCK_COUNTER_H
diff --git a/vdo/logicalZone.c b/vdo/logicalZone.c
index 0e41f375..785a62b7 100644
--- a/vdo/logicalZone.c
+++ b/vdo/logicalZone.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/logicalZone.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/logicalZone.c#24 $
  */
 
 #include "logicalZone.h"
diff --git a/vdo/logicalZone.h b/vdo/logicalZone.h
index 9deba7ed..975bc4cd 100644
--- a/vdo/logicalZone.h
+++ b/vdo/logicalZone.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/logicalZone.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/logicalZone.h#7 $
  */
 
 #ifndef LOGICAL_ZONE_H
diff --git a/vdo/messageStats.h b/vdo/messageStats.h
index 2e06486e..525993bb 100644
--- a/vdo/messageStats.h
+++ b/vdo/messageStats.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/messageStats.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/messageStats.h#5 $
  *
  */
 
diff --git a/vdo/numUtils.h b/vdo/numUtils.h
index c211e138..75f1e77c 100644
--- a/vdo/numUtils.h
+++ b/vdo/numUtils.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/numUtils.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/numUtils.h#6 $
  *
  * THIS FILE IS A CANDIDATE FOR THE EVENTUAL UTILITY LIBRARY.
  */
diff --git a/vdo/packedRecoveryJournalBlock.h b/vdo/packedRecoveryJournalBlock.h
index c655c0de..3c154a57 100644
--- a/vdo/packedRecoveryJournalBlock.h
+++ b/vdo/packedRecoveryJournalBlock.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/packedRecoveryJournalBlock.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/packedRecoveryJournalBlock.h#5 $
  */
 
 #ifndef PACKED_RECOVERY_JOURNAL_BLOCK_H
diff --git a/vdo/packedReferenceBlock.h b/vdo/packedReferenceBlock.h
index 867c5fab..cb65d8f0 100644
--- a/vdo/packedReferenceBlock.h
+++ b/vdo/packedReferenceBlock.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/packedReferenceBlock.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/packedReferenceBlock.h#4 $
  */
 
 #ifndef PACKED_REFERENCE_BLOCK_H
diff --git a/vdo/packer.c b/vdo/packer.c
index f4081b6e..02a6a056 100644
--- a/vdo/packer.c
+++ b/vdo/packer.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/packer.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/packer.c#39 $
  */
 
 #include "packerInternals.h"
diff --git a/vdo/packer.h b/vdo/packer.h
index d0e9618b..aededb1d 100644
--- a/vdo/packer.h
+++ b/vdo/packer.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/packer.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/packer.h#10 $
  */
 
 #ifndef PACKER_H
diff --git a/vdo/packerInternals.h b/vdo/packerInternals.h
index 6c777da0..2abda247 100644
--- a/vdo/packerInternals.h
+++ b/vdo/packerInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/packerInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/packerInternals.h#5 $
  */
 
 #ifndef PACKER_INTERNALS_H
diff --git a/vdo/partitionCopy.c b/vdo/partitionCopy.c
index 7f09b3ea..e10aebea 100644
--- a/vdo/partitionCopy.c
+++ b/vdo/partitionCopy.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/partitionCopy.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/partitionCopy.c#13 $
  */
 
 #include "partitionCopy.h"
diff --git a/vdo/partitionCopy.h b/vdo/partitionCopy.h
index 8d64c055..43b9311e 100644
--- a/vdo/partitionCopy.h
+++ b/vdo/partitionCopy.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/partitionCopy.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/partitionCopy.h#6 $
  */
 
 #ifndef PARTITION_COPY_H
diff --git a/vdo/pbnLock.c b/vdo/pbnLock.c
index 5f7d054f..f70ab491 100644
--- a/vdo/pbnLock.c
+++ b/vdo/pbnLock.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/pbnLock.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/pbnLock.c#6 $
  */
 
 #include "pbnLock.h"
diff --git a/vdo/pbnLock.h b/vdo/pbnLock.h
index 6771d87a..728cf44d 100644
--- a/vdo/pbnLock.h
+++ b/vdo/pbnLock.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/pbnLock.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/pbnLock.h#6 $
  */
 
 #ifndef PBN_LOCK_H
diff --git a/vdo/pbnLockPool.c b/vdo/pbnLockPool.c
index 5cdeb2ff..4c932736 100644
--- a/vdo/pbnLockPool.c
+++ b/vdo/pbnLockPool.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/pbnLockPool.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/pbnLockPool.c#9 $
  */
 
 #include "pbnLockPool.h"
diff --git a/vdo/pbnLockPool.h b/vdo/pbnLockPool.h
index 79cbc6c3..194f3b76 100644
--- a/vdo/pbnLockPool.h
+++ b/vdo/pbnLockPool.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/pbnLockPool.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/pbnLockPool.h#7 $
  */
 
 #ifndef PBN_LOCK_POOL_H
diff --git a/vdo/physicalZone.c b/vdo/physicalZone.c
index b7118c3e..255af450 100644
--- a/vdo/physicalZone.c
+++ b/vdo/physicalZone.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/physicalZone.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/physicalZone.c#18 $
  */
 
 #include "physicalZone.h"
diff --git a/vdo/physicalZone.h b/vdo/physicalZone.h
index 3770a0a4..a1cbcbb6 100644
--- a/vdo/physicalZone.h
+++ b/vdo/physicalZone.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/physicalZone.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/physicalZone.h#8 $
  */
 
 #ifndef PHYSICAL_ZONE_H
diff --git a/vdo/pointerMap.c b/vdo/pointerMap.c
index 115660a4..f2683796 100644
--- a/vdo/pointerMap.c
+++ b/vdo/pointerMap.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/pointerMap.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/pointerMap.c#9 $
  */
 
 /**
diff --git a/vdo/pointerMap.h b/vdo/pointerMap.h
index 76b7cb53..b221a54f 100644
--- a/vdo/pointerMap.h
+++ b/vdo/pointerMap.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/pointerMap.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/pointerMap.h#5 $
  */
 
 #ifndef POINTER_MAP_H
diff --git a/vdo/poolSysfs.c b/vdo/poolSysfs.c
index 018cd89a..d9eee846 100644
--- a/vdo/poolSysfs.c
+++ b/vdo/poolSysfs.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/poolSysfs.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/poolSysfs.c#11 $
  */
 
 #include "poolSysfs.h"
diff --git a/vdo/poolSysfs.h b/vdo/poolSysfs.h
index 6f46b589..faf5bd1f 100644
--- a/vdo/poolSysfs.h
+++ b/vdo/poolSysfs.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/poolSysfs.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/poolSysfs.h#7 $
  */
 
 #ifndef POOL_SYSFS_H
diff --git a/vdo/priorityTable.c b/vdo/priorityTable.c
index e7934e64..940e3c79 100644
--- a/vdo/priorityTable.c
+++ b/vdo/priorityTable.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/priorityTable.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/priorityTable.c#9 $
  */
 
 #include "priorityTable.h"
diff --git a/vdo/priorityTable.h b/vdo/priorityTable.h
index aca28bea..5fc7b676 100644
--- a/vdo/priorityTable.h
+++ b/vdo/priorityTable.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/priorityTable.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/priorityTable.h#5 $
  */
 
 #ifndef PRIORITY_TABLE_H
diff --git a/vdo/readOnlyNotifier.c b/vdo/readOnlyNotifier.c
index eb8d7524..6d7001c6 100644
--- a/vdo/readOnlyNotifier.c
+++ b/vdo/readOnlyNotifier.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/readOnlyNotifier.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/readOnlyNotifier.c#20 $
  */
 
 #include "readOnlyNotifier.h"
diff --git a/vdo/readOnlyNotifier.h b/vdo/readOnlyNotifier.h
index 347ed727..d7d55e71 100644
--- a/vdo/readOnlyNotifier.h
+++ b/vdo/readOnlyNotifier.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/readOnlyNotifier.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/readOnlyNotifier.h#5 $
  */
 
 /*
diff --git a/vdo/readOnlyRebuild.c b/vdo/readOnlyRebuild.c
index 76156775..f2c8e148 100644
--- a/vdo/readOnlyRebuild.c
+++ b/vdo/readOnlyRebuild.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/readOnlyRebuild.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/readOnlyRebuild.c#30 $
  */
 
 #include "readOnlyRebuild.h"
diff --git a/vdo/readOnlyRebuild.h b/vdo/readOnlyRebuild.h
index 3f56f749..3d0cda67 100644
--- a/vdo/readOnlyRebuild.h
+++ b/vdo/readOnlyRebuild.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/readOnlyRebuild.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/readOnlyRebuild.h#5 $
  */
 
 #ifndef READ_ONLY_REBUILD_H
diff --git a/vdo/recoveryJournal.c b/vdo/recoveryJournal.c
index aba8cebd..462b7ebc 100644
--- a/vdo/recoveryJournal.c
+++ b/vdo/recoveryJournal.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/recoveryJournal.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/recoveryJournal.c#32 $
  */
 
 #include "recoveryJournal.h"
diff --git a/vdo/recoveryJournal.h b/vdo/recoveryJournal.h
index 64159f7a..9ac85f64 100644
--- a/vdo/recoveryJournal.h
+++ b/vdo/recoveryJournal.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/recoveryJournal.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/recoveryJournal.h#11 $
  */
 
 #ifndef RECOVERY_JOURNAL_H
diff --git a/vdo/recoveryJournalBlock.c b/vdo/recoveryJournalBlock.c
index 59046497..037b79d9 100644
--- a/vdo/recoveryJournalBlock.c
+++ b/vdo/recoveryJournalBlock.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/recoveryJournalBlock.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/recoveryJournalBlock.c#21 $
  */
 
 #include "recoveryJournalBlock.h"
diff --git a/vdo/recoveryJournalBlock.h b/vdo/recoveryJournalBlock.h
index 42c80593..e6bd1e42 100644
--- a/vdo/recoveryJournalBlock.h
+++ b/vdo/recoveryJournalBlock.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/recoveryJournalBlock.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/recoveryJournalBlock.h#8 $
  */
 
 #ifndef RECOVERY_JOURNAL_BLOCK_H
diff --git a/vdo/recoveryJournalEntry.h b/vdo/recoveryJournalEntry.h
index 5894db27..83e33697 100644
--- a/vdo/recoveryJournalEntry.h
+++ b/vdo/recoveryJournalEntry.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/recoveryJournalEntry.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/recoveryJournalEntry.h#7 $
  */
 
 #ifndef RECOVERY_JOURNAL_ENTRY_H
diff --git a/vdo/recoveryJournalFormat.c b/vdo/recoveryJournalFormat.c
index f31019ad..b43bdd11 100644
--- a/vdo/recoveryJournalFormat.c
+++ b/vdo/recoveryJournalFormat.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/recoveryJournalFormat.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/recoveryJournalFormat.c#8 $
  */
 
 #include "recoveryJournalFormat.h"
diff --git a/vdo/recoveryJournalFormat.h b/vdo/recoveryJournalFormat.h
index 57395c49..18a86a07 100644
--- a/vdo/recoveryJournalFormat.h
+++ b/vdo/recoveryJournalFormat.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/recoveryJournalFormat.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/recoveryJournalFormat.h#5 $
  */
 
 #ifndef RECOVERY_JOURNAL_FORMAT_H
diff --git a/vdo/recoveryJournalInternals.h b/vdo/recoveryJournalInternals.h
index 9e4b93f2..42dab20d 100644
--- a/vdo/recoveryJournalInternals.h
+++ b/vdo/recoveryJournalInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/recoveryJournalInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/recoveryJournalInternals.h#4 $
  */
 
 #ifndef RECOVERY_JOURNAL_INTERNALS_H
diff --git a/vdo/recoveryUtils.c b/vdo/recoveryUtils.c
index da757112..ed000a0f 100644
--- a/vdo/recoveryUtils.c
+++ b/vdo/recoveryUtils.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/recoveryUtils.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/recoveryUtils.c#21 $
  */
 
 #include "recoveryUtils.h"
diff --git a/vdo/recoveryUtils.h b/vdo/recoveryUtils.h
index 8d186778..0d8c9839 100644
--- a/vdo/recoveryUtils.h
+++ b/vdo/recoveryUtils.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/recoveryUtils.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/recoveryUtils.h#7 $
  */
 
 #ifndef RECOVERY_UTILS_H
diff --git a/vdo/refCounts.c b/vdo/refCounts.c
index 1384e590..f688f193 100644
--- a/vdo/refCounts.c
+++ b/vdo/refCounts.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/refCounts.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/refCounts.c#26 $
  */
 
 #include "refCounts.h"
diff --git a/vdo/refCounts.h b/vdo/refCounts.h
index a99ebfbf..011a1b71 100644
--- a/vdo/refCounts.h
+++ b/vdo/refCounts.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/refCounts.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/refCounts.h#8 $
  */
 
 #ifndef REF_COUNTS_H
diff --git a/vdo/refCountsInternals.h b/vdo/refCountsInternals.h
index af60d951..b76f2e16 100644
--- a/vdo/refCountsInternals.h
+++ b/vdo/refCountsInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/refCountsInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/refCountsInternals.h#6 $
  */
 
 #ifndef REF_COUNTS_INTERNALS_H
diff --git a/vdo/referenceCountRebuild.c b/vdo/referenceCountRebuild.c
index 0cc031b3..5ed4f58d 100644
--- a/vdo/referenceCountRebuild.c
+++ b/vdo/referenceCountRebuild.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/referenceCountRebuild.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/referenceCountRebuild.c#33 $
  */
 
 #include "referenceCountRebuild.h"
diff --git a/vdo/referenceCountRebuild.h b/vdo/referenceCountRebuild.h
index 8fa787ba..693c8222 100644
--- a/vdo/referenceCountRebuild.h
+++ b/vdo/referenceCountRebuild.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/referenceCountRebuild.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/referenceCountRebuild.h#6 $
  */
 
 #ifndef REFERENCE_COUNT_REBUILD_H
diff --git a/vdo/referenceOperation.c b/vdo/referenceOperation.c
index c07f99b2..f842fc50 100644
--- a/vdo/referenceOperation.c
+++ b/vdo/referenceOperation.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/referenceOperation.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/referenceOperation.c#6 $
  */
 
 #include "referenceOperation.h"
diff --git a/vdo/referenceOperation.h b/vdo/referenceOperation.h
index 730aeeb7..699e7045 100644
--- a/vdo/referenceOperation.h
+++ b/vdo/referenceOperation.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/referenceOperation.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/referenceOperation.h#6 $
  */
 
 #ifndef REFERENCE_OPERATION_H
diff --git a/vdo/slab.c b/vdo/slab.c
index fb4d8ff5..93b77809 100644
--- a/vdo/slab.c
+++ b/vdo/slab.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slab.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slab.c#25 $
  */
 
 #include "slab.h"
diff --git a/vdo/slab.h b/vdo/slab.h
index a8de50eb..e84b1bce 100644
--- a/vdo/slab.h
+++ b/vdo/slab.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slab.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slab.h#8 $
  */
 
 #ifndef VDO_SLAB_H
diff --git a/vdo/slabDepot.c b/vdo/slabDepot.c
index 48cea9ce..70437f79 100644
--- a/vdo/slabDepot.c
+++ b/vdo/slabDepot.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabDepot.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabDepot.c#37 $
  */
 
 #include "slabDepot.h"
@@ -510,12 +510,12 @@ block_count_t get_vdo_slab_depot_data_blocks(const struct slab_depot *depot)
 block_count_t get_vdo_slab_depot_free_blocks(const struct slab_depot *depot)
 {
 	/*
-	 * We can't ever shrink a volume except when resize fails, and we can't
-	 * allocate from the new slabs until after the resize succeeds, so by
-	 * getting the number of allocated blocks first, we ensure the allocated
-	 * count is always less than the capacity. Doing it in the other order
-	 * on a full volume could lose a race with a sucessful resize, resulting
-	 * in a nonsensical negative/underflow result.
+	 * We can't ever shrink a volume except when resize fails, and we
+	 * can't allocate from the new slabs until after the resize succeeds,
+	 * so by getting the number of allocated blocks first, we ensure the
+	 * allocated count is always less than the capacity. Doing it in the
+	 * other order on a full volume could lose a race with a successful
+	 * resize, resulting in a nonsensical negative/underflow result.
 	 */
 	block_count_t allocated = get_vdo_slab_depot_allocated_blocks(depot);
 	smp_mb();
diff --git a/vdo/slabDepot.h b/vdo/slabDepot.h
index e3d3feb9..3e1e9a6f 100644
--- a/vdo/slabDepot.h
+++ b/vdo/slabDepot.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabDepot.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabDepot.h#13 $
  */
 
 #ifndef SLAB_DEPOT_H
diff --git a/vdo/slabDepotFormat.c b/vdo/slabDepotFormat.c
index f5692b0e..9fd902a3 100644
--- a/vdo/slabDepotFormat.c
+++ b/vdo/slabDepotFormat.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabDepotFormat.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabDepotFormat.c#10 $
  */
 
 #include "slabDepotFormat.h"
diff --git a/vdo/slabDepotFormat.h b/vdo/slabDepotFormat.h
index f9ea0307..357fe5f9 100644
--- a/vdo/slabDepotFormat.h
+++ b/vdo/slabDepotFormat.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabDepotFormat.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabDepotFormat.h#5 $
  */
 
 #ifndef SLAB_DEPOT_FORMAT_H
diff --git a/vdo/slabDepotInternals.h b/vdo/slabDepotInternals.h
index 29b242fa..055adf04 100644
--- a/vdo/slabDepotInternals.h
+++ b/vdo/slabDepotInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabDepotInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabDepotInternals.h#5 $
  */
 
 #ifndef SLAB_DEPOT_INTERNALS_H
diff --git a/vdo/slabIterator.h b/vdo/slabIterator.h
index 2c6d602f..10e5c8e4 100644
--- a/vdo/slabIterator.h
+++ b/vdo/slabIterator.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabIterator.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabIterator.h#6 $
  */
 
 #ifndef SLAB_ITERATOR_H
diff --git a/vdo/slabJournal.c b/vdo/slabJournal.c
index 0f1345de..194fc794 100644
--- a/vdo/slabJournal.c
+++ b/vdo/slabJournal.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabJournal.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabJournal.c#32 $
  */
 
 #include "slabJournalInternals.h"
diff --git a/vdo/slabJournal.h b/vdo/slabJournal.h
index d9cae08e..e1147ef5 100644
--- a/vdo/slabJournal.h
+++ b/vdo/slabJournal.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabJournal.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabJournal.h#7 $
  */
 
 #ifndef SLAB_JOURNAL_H
diff --git a/vdo/slabJournalEraser.c b/vdo/slabJournalEraser.c
index 0f493f73..4fa2b150 100644
--- a/vdo/slabJournalEraser.c
+++ b/vdo/slabJournalEraser.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabJournalEraser.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabJournalEraser.c#11 $
  */
 
 #include "slabJournalEraser.h"
diff --git a/vdo/slabJournalEraser.h b/vdo/slabJournalEraser.h
index 0c76d3ce..2ddcdc09 100644
--- a/vdo/slabJournalEraser.h
+++ b/vdo/slabJournalEraser.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabJournalEraser.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabJournalEraser.h#5 $
  */
 
 #ifndef SLAB_JOURNAL_ERASER_H
diff --git a/vdo/slabJournalFormat.c b/vdo/slabJournalFormat.c
index a11137a7..79bab6a1 100644
--- a/vdo/slabJournalFormat.c
+++ b/vdo/slabJournalFormat.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabJournalFormat.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabJournalFormat.c#6 $
  */
 
 #include "slabJournalFormat.h"
diff --git a/vdo/slabJournalFormat.h b/vdo/slabJournalFormat.h
index f26365d4..5d4e0e28 100644
--- a/vdo/slabJournalFormat.h
+++ b/vdo/slabJournalFormat.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabJournalFormat.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabJournalFormat.h#8 $
  */
 
 #ifndef SLAB_JOURNAL_FORMAT_H
diff --git a/vdo/slabJournalInternals.h b/vdo/slabJournalInternals.h
index 97947c99..772f4339 100644
--- a/vdo/slabJournalInternals.h
+++ b/vdo/slabJournalInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabJournalInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabJournalInternals.h#5 $
  */
 
 #ifndef SLAB_JOURNAL_INTERNALS_H
diff --git a/vdo/slabScrubber.c b/vdo/slabScrubber.c
index 34f1c687..68946a59 100644
--- a/vdo/slabScrubber.c
+++ b/vdo/slabScrubber.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabScrubber.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabScrubber.c#29 $
  */
 
 #include "slabScrubberInternals.h"
diff --git a/vdo/slabScrubber.h b/vdo/slabScrubber.h
index 7803f336..bc2b769c 100644
--- a/vdo/slabScrubber.h
+++ b/vdo/slabScrubber.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabScrubber.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabScrubber.h#7 $
  */
 
 #ifndef SLAB_SCRUBBER_H
diff --git a/vdo/slabScrubberInternals.h b/vdo/slabScrubberInternals.h
index de6af965..b0665342 100644
--- a/vdo/slabScrubberInternals.h
+++ b/vdo/slabScrubberInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabScrubberInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabScrubberInternals.h#2 $
  */
 
 #ifndef SLAB_SCRUBBER_INTERNALS_H
diff --git a/vdo/slabSummary.c b/vdo/slabSummary.c
index 3f134de4..a0b881dd 100644
--- a/vdo/slabSummary.c
+++ b/vdo/slabSummary.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabSummary.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabSummary.c#23 $
  */
 
 #include "slabSummary.h"
diff --git a/vdo/slabSummary.h b/vdo/slabSummary.h
index 03b4b9a4..ec9a39ec 100644
--- a/vdo/slabSummary.h
+++ b/vdo/slabSummary.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabSummary.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabSummary.h#9 $
  */
 
 #ifndef SLAB_SUMMARY_H
diff --git a/vdo/slabSummaryFormat.h b/vdo/slabSummaryFormat.h
index 68cf4a9f..d6eb98d0 100644
--- a/vdo/slabSummaryFormat.h
+++ b/vdo/slabSummaryFormat.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabSummaryFormat.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabSummaryFormat.h#5 $
  */
 
 #ifndef SLAB_SUMMARY_FORMAT_H
diff --git a/vdo/slabSummaryInternals.h b/vdo/slabSummaryInternals.h
index 02da6268..504fe298 100644
--- a/vdo/slabSummaryInternals.h
+++ b/vdo/slabSummaryInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/slabSummaryInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/slabSummaryInternals.h#4 $
  */
 
 #ifndef SLAB_SUMMARY_INTERNALS_H
diff --git a/vdo/statusCodes.c b/vdo/statusCodes.c
index b0780ac7..c87d4466 100644
--- a/vdo/statusCodes.c
+++ b/vdo/statusCodes.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/statusCodes.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/statusCodes.c#15 $
  */
 
 #include "statusCodes.h"
@@ -67,6 +67,7 @@ const struct error_info vdo_status_list[] = {
 	{ "VDO_BAD_NONCE", "Bad nonce" },
 	{ "VDO_JOURNAL_OVERFLOW", "Journal sequence number overflow" },
 	{ "VDO_INVALID_ADMIN_STATE", "Invalid operation for current state" },
+	{ "VDO_CANT_ADD_SYSFS_NODE", "Failed to add sysfs node" },
 };
 
 static once_state_t vdo_status_codes_registered = ONCE_STATE_INITIALIZER;
diff --git a/vdo/statusCodes.h b/vdo/statusCodes.h
index 008e718b..77f29f4f 100644
--- a/vdo/statusCodes.h
+++ b/vdo/statusCodes.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/statusCodes.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/statusCodes.h#9 $
  */
 
 #ifndef STATUS_CODES_H
@@ -114,6 +114,8 @@ enum vdo_status_codes {
 	VDO_JOURNAL_OVERFLOW,
 	/** the VDO is not in a state to perform an admin operation */
 	VDO_INVALID_ADMIN_STATE,
+	/** failure adding a sysfs node */
+	VDO_CANT_ADD_SYSFS_NODE,
 	/** one more than last error code */
 	VDO_STATUS_CODE_LAST,
 	VDO_STATUS_CODE_BLOCK_END = VDO_BLOCK_END
diff --git a/vdo/superBlock.c b/vdo/superBlock.c
index 91e6155e..1e659a8b 100644
--- a/vdo/superBlock.c
+++ b/vdo/superBlock.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/superBlock.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/superBlock.c#15 $
  */
 
 #include "superBlock.h"
diff --git a/vdo/superBlock.h b/vdo/superBlock.h
index ed07c39a..1cd23b88 100644
--- a/vdo/superBlock.h
+++ b/vdo/superBlock.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/superBlock.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/superBlock.h#8 $
  */
 
 #ifndef SUPER_BLOCK_H
diff --git a/vdo/superBlockCodec.c b/vdo/superBlockCodec.c
index 719fbaca..c66263e9 100644
--- a/vdo/superBlockCodec.c
+++ b/vdo/superBlockCodec.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/superBlockCodec.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/superBlockCodec.c#16 $
  */
 
 #include "superBlockCodec.h"
diff --git a/vdo/superBlockCodec.h b/vdo/superBlockCodec.h
index 67a69725..e681c15c 100644
--- a/vdo/superBlockCodec.h
+++ b/vdo/superBlockCodec.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/superBlockCodec.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/superBlockCodec.h#6 $
  */
 
 #ifndef SUPER_BLOCK_CODEC_H
diff --git a/vdo/syncCompletion.c b/vdo/syncCompletion.c
index 6ef170a8..ee64cdf5 100644
--- a/vdo/syncCompletion.c
+++ b/vdo/syncCompletion.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/syncCompletion.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/syncCompletion.c#5 $
  */
 
 #include "syncCompletion.h"
diff --git a/vdo/syncCompletion.h b/vdo/syncCompletion.h
index 68d871d0..dd88ca65 100644
--- a/vdo/syncCompletion.h
+++ b/vdo/syncCompletion.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/syncCompletion.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/syncCompletion.h#5 $
  */
 
 #ifndef SYNC_COMPLETION_H
diff --git a/vdo/sysfs.c b/vdo/sysfs.c
index ebb7aef5..ffea58fc 100644
--- a/vdo/sysfs.c
+++ b/vdo/sysfs.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/sysfs.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/sysfs.c#8 $
  */
 
 #include "sysfs.h"
diff --git a/vdo/threadConfig.c b/vdo/threadConfig.c
index 2ae2d8e5..f65be875 100644
--- a/vdo/threadConfig.c
+++ b/vdo/threadConfig.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/threadConfig.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/threadConfig.c#17 $
  */
 
 #include "threadConfig.h"
diff --git a/vdo/threadConfig.h b/vdo/threadConfig.h
index a6ea7738..310953d6 100644
--- a/vdo/threadConfig.h
+++ b/vdo/threadConfig.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/threadConfig.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/threadConfig.h#11 $
  */
 
 #ifndef THREAD_CONFIG_H
diff --git a/vdo/types.h b/vdo/types.h
index 07b0b91f..5580da21 100644
--- a/vdo/types.h
+++ b/vdo/types.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/types.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/types.h#14 $
  */
 
 #ifndef TYPES_H
diff --git a/vdo/vdo.c b/vdo/vdo.c
index 34d68417..bd58fb49 100644
--- a/vdo/vdo.c
+++ b/vdo/vdo.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdo.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdo.c#101 $
  */
 
 /*
@@ -41,6 +41,7 @@
 #include "numUtils.h"
 #include "packer.h"
 #include "physicalZone.h"
+#include "poolSysfs.h"
 #include "readOnlyNotifier.h"
 #include "recoveryJournal.h"
 #include "releaseVersions.h"
@@ -85,6 +86,16 @@ void destroy_vdo(struct vdo *vdo)
 	int i;
 	const struct thread_config *thread_config = vdo->thread_config;
 
+	vdo->allocations_allowed = true;
+
+	// Stop services that need to gather VDO statistics from the worker
+	// threads.
+	if (vdo->sysfs_added) {
+		init_completion(&vdo->stats_shutdown);
+		kobject_put(&vdo->stats_directory);
+		wait_for_completion(&vdo->stats_shutdown);
+	}
+
 	finish_vdo(vdo);
 	unregister_vdo(vdo);
 	free_work_queue(UDS_FORGET(vdo->cpu_queue));
@@ -145,15 +156,45 @@ void destroy_vdo(struct vdo *vdo)
 	 * reference count; when the count goes to zero the VDO object will be
 	 * freed as a side effect.
 	 */
-	if (get_vdo_admin_state_code(&vdo->admin_state)
-	    == VDO_ADMIN_STATE_NEW) {
+	if (!vdo->sysfs_added) {
 		UDS_FREE(vdo);
 	} else {
-		kobject_put(&vdo->work_queue_directory);
 		kobject_put(&vdo->vdo_directory);
 	}
 }
 
+/**
+ * Signal that sysfs stats have been shut down.
+ *
+ * @param directory  The vdo stats directory
+ **/
+static void pool_stats_release(struct kobject *directory)
+{
+	struct vdo *vdo = container_of(directory, struct vdo, stats_directory);
+	complete(&vdo->stats_shutdown);
+}
+
+/**********************************************************************/
+int add_vdo_sysfs_stats_dir(struct vdo *vdo)
+{
+	int result;
+	static struct kobj_type stats_directory_type = {
+		.release = pool_stats_release,
+		.sysfs_ops = &vdo_pool_stats_sysfs_ops,
+		.default_attrs = vdo_pool_stats_attrs,
+	};
+
+	kobject_init(&vdo->stats_directory, &stats_directory_type);
+	result = kobject_add(&vdo->stats_directory,
+			     &vdo->vdo_directory,
+			     "statistics");
+	if (result != 0) {
+		return VDO_CANT_ADD_SYSFS_NODE;
+	}
+
+	return VDO_SUCCESS;
+}
+
 /**********************************************************************/
 struct block_device *get_vdo_backing_device(const struct vdo *vdo)
 {
diff --git a/vdo/vdo.h b/vdo/vdo.h
index 29ac27a6..919740aa 100644
--- a/vdo/vdo.h
+++ b/vdo/vdo.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdo.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdo.h#43 $
  */
 
 #ifndef VDO_H
@@ -33,6 +33,14 @@
  **/
 void destroy_vdo(struct vdo *vdo);
 
+/**
+ * Add the stats directory to the vdo sysfs directory.
+ *
+ * @param vdo  The vdo
+ *
+ * @return VDO_SUCCESS or an error
+ **/
+int __must_check add_vdo_sysfs_stats_dir(struct vdo *vdo);
 
 /**
  * Get the block device object underlying a vdo.
diff --git a/vdo/vdoCommon.h b/vdo/vdoCommon.h
index 24acce85..01e029e7 100644
--- a/vdo/vdoCommon.h
+++ b/vdo/vdoCommon.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/vdoCommon.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/vdoCommon.h#3 $
  */
 
 #ifndef VDO_COMMON_H
diff --git a/vdo/vdoComponent.c b/vdo/vdoComponent.c
index 69d147d1..5e0b4f7a 100644
--- a/vdo/vdoComponent.c
+++ b/vdo/vdoComponent.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoComponent.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoComponent.c#11 $
  */
 
 #include "vdoComponent.h"
diff --git a/vdo/vdoComponent.h b/vdo/vdoComponent.h
index 2e3e1f32..2b903a71 100644
--- a/vdo/vdoComponent.h
+++ b/vdo/vdoComponent.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoComponent.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoComponent.h#6 $
  */
 
 #ifndef VDO_COMPONENT_H
diff --git a/vdo/vdoComponentStates.c b/vdo/vdoComponentStates.c
index d716378e..1b83b877 100644
--- a/vdo/vdoComponentStates.c
+++ b/vdo/vdoComponentStates.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoComponentStates.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoComponentStates.c#16 $
  */
 
 #include "vdoComponentStates.h"
diff --git a/vdo/vdoComponentStates.h b/vdo/vdoComponentStates.h
index 795e7228..8436aefc 100644
--- a/vdo/vdoComponentStates.h
+++ b/vdo/vdoComponentStates.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoComponentStates.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoComponentStates.h#7 $
  */
 
 #ifndef VDO_COMPONENT_STATES_H
@@ -89,7 +89,7 @@ decode_vdo_component_states(struct buffer *buffer,
  * @param geometry_nonce  The nonce from the geometry block
  * @param size            The size of underlying storage
  *
- * @return VDO_SUCESS or an error if the configuration is invalid
+ * @return VDO_SUCCESS or an error if the configuration is invalid
  **/
 int __must_check
 validate_vdo_component_states(struct vdo_component_states *states,
diff --git a/vdo/vdoInit.c b/vdo/vdoInit.c
index 11e048bb..9361beba 100644
--- a/vdo/vdoInit.c
+++ b/vdo/vdoInit.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoInit.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoInit.c#28 $
  */
 
 #include "vdoInit.h"
@@ -39,57 +39,12 @@
 #include "vdoInternal.h"
 #include "volumeGeometry.h"
 
-
 /**********************************************************************/
 const char *get_vdo_device_name(const struct dm_target *target)
 {
 	return dm_device_name(dm_table_get_md(target->table));
 }
 
-/**
- * Initialize the vdo and work queue sysfs directories.
- *
- * @param vdo     The vdo being initialized
- * @param target  The device-mapper target this vdo is
- * @param reason  A pointer to hold an error message on failure
- *
- * @return VDO_SUCCESS or an error code
- **/
-static int initialize_vdo_kobjects(struct vdo *vdo,
-				   struct dm_target *target,
-				   char **reason)
-{
-	int result;
-	struct mapped_device *md = dm_table_get_md(target->table);
-	kobject_init(&vdo->vdo_directory, &vdo_directory_type);
-	result = kobject_add(&vdo->vdo_directory,
-			     &disk_to_dev(dm_disk(md))->kobj,
-			     "vdo");
-	if (result != 0) {
-		destroy_vdo(vdo);
-		kobject_put(&vdo->vdo_directory);
-		*reason = "Cannot add sysfs node";
-		return result;
-	}
-
-	// Indicate that kobject_put() should now be called on the vdo
-	// directory in order to free the vdo rather than doing so directly.
-	set_vdo_admin_state_code(&vdo->admin_state,
-				 VDO_ADMIN_STATE_INITIALIZED);
-	kobject_init(&vdo->work_queue_directory,
-		     &vdo_work_queue_directory_type);
-	result = kobject_add(&vdo->work_queue_directory,
-			     &vdo->vdo_directory,
-			     "work_queues");
-	if (result != 0) {
-		*reason = "Cannot add sysfs node";
-		destroy_vdo(vdo);
-		return result;
-	}
-
-	return VDO_SUCCESS;
-}
-
 /**
  * Allocate a vdos threads, queues, and other structures which scale with the
  * thread config.
@@ -185,5 +140,7 @@ int initialize_vdo(struct vdo *vdo,
 		return result;
 	}
 
-	return initialize_vdo_kobjects(vdo, config->owning_target, reason);
+	set_vdo_admin_state_code(&vdo->admin_state,
+				 VDO_ADMIN_STATE_INITIALIZED);
+	return result;
 }
diff --git a/vdo/vdoInit.h b/vdo/vdoInit.h
index de82369c..11461e93 100644
--- a/vdo/vdoInit.h
+++ b/vdo/vdoInit.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoInit.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoInit.h#5 $
  */
 
 #ifndef VDO_INIT_H
diff --git a/vdo/vdoInternal.h b/vdo/vdoInternal.h
index f8f3b0b4..5b44ce8a 100644
--- a/vdo/vdoInternal.h
+++ b/vdo/vdoInternal.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoInternal.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoInternal.h#21 $
  */
 
 #ifndef VDO_INTERNAL_H
@@ -156,8 +156,8 @@ struct vdo {
 	struct vdo_statistics stats_buffer;
 	/* Protects the stats_buffer */
 	struct mutex stats_mutex;
-	/* true if sysfs statistics directory is set up */
-	bool stats_added;
+	/* true if sysfs directory is set up */
+	bool sysfs_added;
 	/* Used when shutting down the sysfs statistics */
 	struct completion stats_shutdown;
 
@@ -174,7 +174,6 @@ struct vdo {
 
 	// For sysfs
 	struct kobject vdo_directory;
-	struct kobject work_queue_directory;
 	struct kobject stats_directory;
 
 	/** Limit the number of requests that are being processed. */
diff --git a/vdo/vdoLayout.c b/vdo/vdoLayout.c
index f0366769..621c639b 100644
--- a/vdo/vdoLayout.c
+++ b/vdo/vdoLayout.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoLayout.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoLayout.c#19 $
  */
 
 #include "vdoLayout.h"
diff --git a/vdo/vdoLayout.h b/vdo/vdoLayout.h
index ec59fa47..0b6c8c5b 100644
--- a/vdo/vdoLayout.h
+++ b/vdo/vdoLayout.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoLayout.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoLayout.h#9 $
  */
 
 /**
diff --git a/vdo/vdoLayoutInternals.h b/vdo/vdoLayoutInternals.h
index 0a27eea3..c219840f 100644
--- a/vdo/vdoLayoutInternals.h
+++ b/vdo/vdoLayoutInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoLayoutInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoLayoutInternals.h#2 $
  */
 
 #ifndef VDO_LAYOUT_INTERNALS_H
diff --git a/vdo/vdoLoad.c b/vdo/vdoLoad.c
index a8a106e0..3ca060b9 100644
--- a/vdo/vdoLoad.c
+++ b/vdo/vdoLoad.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoLoad.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoLoad.c#51 $
  */
 
 #include "vdoLoad.h"
@@ -28,11 +28,13 @@
 #include "blockMap.h"
 #include "completion.h"
 #include "constants.h"
+#include "dedupeIndex.h"
 #include "deviceConfig.h"
 #include "hashZone.h"
 #include "header.h"
 #include "logicalZone.h"
 #include "physicalZone.h"
+#include "poolSysfs.h"
 #include "readOnlyRebuild.h"
 #include "recoveryJournal.h"
 #include "releaseVersions.h"
@@ -46,10 +48,12 @@
 
 enum {
 	LOAD_PHASE_START = 0,
+	LOAD_PHASE_STATS,
 	LOAD_PHASE_LOAD_DEPOT,
 	LOAD_PHASE_MAKE_DIRTY,
 	LOAD_PHASE_PREPARE_TO_ALLOCATE,
 	LOAD_PHASE_SCRUB_SLABS,
+	LOAD_PHASE_DATA_REDUCTION,
 	LOAD_PHASE_FINISHED,
 	LOAD_PHASE_DRAIN_JOURNAL,
 	LOAD_PHASE_WAIT_FOR_READ_ONLY,
@@ -57,15 +61,18 @@ enum {
 
 static const char *LOAD_PHASE_NAMES[] = {
 	"LOAD_PHASE_START",
+	"LOAD_PHASE_STATS",
 	"LOAD_PHASE_LOAD_DEPOT",
 	"LOAD_PHASE_MAKE_DIRTY",
 	"LOAD_PHASE_PREPARE_TO_ALLOCATE",
 	"LOAD_PHASE_SCRUB_SLABS",
+	"LOAD_PHASE_DATA_REDUCTION",
 	"LOAD_PHASE_FINISHED",
 	"LOAD_PHASE_DRAIN_JOURNAL",
 	"LOAD_PHASE_WAIT_FOR_READ_ONLY",
 };
 
+
 /**
  * Implements vdo_thread_id_getter_for_phase.
  **/
@@ -117,6 +124,37 @@ static enum slab_depot_load_type get_load_type(struct vdo *vdo)
 	return VDO_SLAB_DEPOT_NORMAL_LOAD;
 }
 
+/**
+ * Initialize the vdo sysfs directory.
+ *
+ * @param vdo     The vdo being initialized
+ *
+ * @return VDO_SUCCESS or an error code
+ **/
+static int initialize_vdo_kobjects(struct vdo *vdo)
+{
+	int result;
+	struct dm_target *target = vdo->device_config->owning_target;
+	struct mapped_device *md = dm_table_get_md(target->table);
+
+	kobject_init(&vdo->vdo_directory, &vdo_directory_type);
+	vdo->sysfs_added = true;
+	result = kobject_add(&vdo->vdo_directory,
+			     &disk_to_dev(dm_disk(md))->kobj,
+			     "vdo");
+	if (result != 0) {
+		return VDO_CANT_ADD_SYSFS_NODE;
+	}
+
+	result = add_vdo_dedupe_index_sysfs(vdo->dedupe_index,
+					    &vdo->vdo_directory);
+	if (result != 0) {
+		return VDO_CANT_ADD_SYSFS_NODE;
+	}
+
+	return add_vdo_sysfs_stats_dir(vdo);
+}
+
 /**
  * Callback to do the destructive parts of loading a VDO.
  *
@@ -150,6 +188,11 @@ static void load_callback(struct vdo_completion *completion)
 					       reset_vdo_admin_sub_task(completion));
 		return;
 
+	case LOAD_PHASE_STATS:
+		finish_vdo_completion(reset_vdo_admin_sub_task(completion),
+				      initialize_vdo_kobjects(vdo));
+		return;
+
 	case LOAD_PHASE_LOAD_DEPOT:
 		if (vdo_is_read_only(vdo->read_only_notifier)) {
 			/*
@@ -203,6 +246,10 @@ static void load_callback(struct vdo_completion *completion)
 						reset_vdo_admin_sub_task(completion));
 		return;
 
+	case LOAD_PHASE_DATA_REDUCTION:
+		WRITE_ONCE(vdo->compressing, vdo->device_config->compression);
+		fallthrough;
+
 	case LOAD_PHASE_FINISHED:
 		break;
 
@@ -219,7 +266,6 @@ static void load_callback(struct vdo_completion *completion)
 							   completion);
 		return;
 
-
 	default:
 		set_vdo_completion_result(reset_vdo_admin_sub_task(completion),
 					  UDS_BAD_STATE);
diff --git a/vdo/vdoLoad.h b/vdo/vdoLoad.h
index b178b0d6..01241d7e 100644
--- a/vdo/vdoLoad.h
+++ b/vdo/vdoLoad.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoLoad.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoLoad.h#5 $
  */
 
 #ifndef VDO_LOAD_H
diff --git a/vdo/vdoPageCache.c b/vdo/vdoPageCache.c
index 22415cbc..36ffc62a 100644
--- a/vdo/vdoPageCache.c
+++ b/vdo/vdoPageCache.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoPageCache.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoPageCache.c#24 $
  */
 
 #include "vdoPageCacheInternals.h"
diff --git a/vdo/vdoPageCache.h b/vdo/vdoPageCache.h
index 9eefb1a8..6762d3ef 100644
--- a/vdo/vdoPageCache.h
+++ b/vdo/vdoPageCache.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoPageCache.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoPageCache.h#7 $
  */
 
 #ifndef VDO_PAGE_CACHE_H
diff --git a/vdo/vdoPageCacheInternals.h b/vdo/vdoPageCacheInternals.h
index 4fd5401f..27442c03 100644
--- a/vdo/vdoPageCacheInternals.h
+++ b/vdo/vdoPageCacheInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoPageCacheInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoPageCacheInternals.h#4 $
  */
 
 #ifndef VDO_PAGE_CACHE_INTERNALS_H
diff --git a/vdo/vdoRecovery.c b/vdo/vdoRecovery.c
index 6081589d..c6623ebe 100644
--- a/vdo/vdoRecovery.c
+++ b/vdo/vdoRecovery.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoRecovery.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoRecovery.c#42 $
  */
 
 #include "vdoRecoveryInternals.h"
diff --git a/vdo/vdoRecovery.h b/vdo/vdoRecovery.h
index 9eef085b..1ce80579 100644
--- a/vdo/vdoRecovery.h
+++ b/vdo/vdoRecovery.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoRecovery.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoRecovery.h#6 $
  */
 
 #ifndef VDO_RECOVERY_H
diff --git a/vdo/vdoRecoveryInternals.h b/vdo/vdoRecoveryInternals.h
index 959892a8..5df771ad 100644
--- a/vdo/vdoRecoveryInternals.h
+++ b/vdo/vdoRecoveryInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoRecoveryInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoRecoveryInternals.h#5 $
  */
 
 #ifndef VDO_RECOVERY_INTERNALS_H
diff --git a/vdo/vdoResize.c b/vdo/vdoResize.c
index 95752ce5..b7854719 100644
--- a/vdo/vdoResize.c
+++ b/vdo/vdoResize.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoResize.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoResize.c#27 $
  */
 
 #include "vdoResize.h"
diff --git a/vdo/vdoResize.h b/vdo/vdoResize.h
index 376060c5..0446c2b3 100644
--- a/vdo/vdoResize.h
+++ b/vdo/vdoResize.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoResize.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoResize.h#6 $
  */
 
 #ifndef VDO_RESIZE_H
diff --git a/vdo/vdoResizeLogical.c b/vdo/vdoResizeLogical.c
index ff2658f2..d6403a89 100644
--- a/vdo/vdoResizeLogical.c
+++ b/vdo/vdoResizeLogical.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoResizeLogical.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoResizeLogical.c#24 $
  */
 
 #include "vdoResizeLogical.h"
diff --git a/vdo/vdoResizeLogical.h b/vdo/vdoResizeLogical.h
index 395526f0..60c2940d 100644
--- a/vdo/vdoResizeLogical.h
+++ b/vdo/vdoResizeLogical.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoResizeLogical.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoResizeLogical.h#5 $
  */
 
 #ifndef VDO_RESIZE_LOGICAL_H
diff --git a/vdo/vdoResume.c b/vdo/vdoResume.c
index 1ef17231..942d0b8c 100644
--- a/vdo/vdoResume.c
+++ b/vdo/vdoResume.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoResume.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoResume.c#25 $
  */
 
 #include "vdoResume.h"
@@ -41,6 +41,7 @@ enum {
 	RESUME_PHASE_BLOCK_MAP,
 	RESUME_PHASE_LOGICAL_ZONES,
 	RESUME_PHASE_PACKER,
+	RESUME_PHASE_FLUSHER,
 	RESUME_PHASE_END,
 };
 
@@ -52,6 +53,7 @@ static const char *RESUME_PHASE_NAMES[] = {
 	"RESUME_PHASE_BLOCK_MAP",
 	"RESUME_PHASE_LOGICAL_ZONES",
 	"RESUME_PHASE_PACKER",
+	"RESUME_PHASE_FLUSHER",
 	"RESUME_PHASE_END",
 };
 
@@ -68,6 +70,7 @@ get_thread_id_for_phase(struct admin_completion *admin_completion)
 		return thread_config->journal_thread;
 
 	case RESUME_PHASE_PACKER:
+	case RESUME_PHASE_FLUSHER:
 		return thread_config->packer_thread;
 
 	default:
@@ -156,9 +159,24 @@ static void resume_callback(struct vdo_completion *completion)
 		return;
 
 	case RESUME_PHASE_PACKER:
+	{
+		bool was_enabled = get_vdo_compressing(vdo);
+		bool enable = vdo->device_config->compression;
+
+		if (enable != was_enabled) {
+			WRITE_ONCE(vdo->compressing, enable);
+		}
+		uds_log_info("compression is %s",
+			     (enable ? "enabled" : "disabled"));
+
 		resume_vdo_packer(vdo->packer,
 				  reset_vdo_admin_sub_task(completion));
 		return;
+	}
+	case RESUME_PHASE_FLUSHER:
+		vdo_resume_flusher(vdo->flusher,
+				   reset_vdo_admin_sub_task(completion));
+		return;
 
 	case RESUME_PHASE_END:
 		break;
diff --git a/vdo/vdoResume.h b/vdo/vdoResume.h
index ec207149..6507d650 100644
--- a/vdo/vdoResume.h
+++ b/vdo/vdoResume.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoResume.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoResume.h#5 $
  */
 
 #ifndef VDO_RESUME_H
diff --git a/vdo/vdoState.c b/vdo/vdoState.c
index 0f2fc330..834465d4 100644
--- a/vdo/vdoState.c
+++ b/vdo/vdoState.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoState.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoState.c#7 $
  */
 
 #include "vdoState.h"
diff --git a/vdo/vdoState.h b/vdo/vdoState.h
index 72bd1435..dfbd5b4b 100644
--- a/vdo/vdoState.h
+++ b/vdo/vdoState.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoState.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoState.h#5 $
  */
 
 #ifndef VDO_STATE_H
diff --git a/vdo/vdoStringUtils.c b/vdo/vdoStringUtils.c
index 84d90750..25e3c048 100644
--- a/vdo/vdoStringUtils.c
+++ b/vdo/vdoStringUtils.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/vdoStringUtils.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/vdoStringUtils.c#7 $
  */
 
 #include "vdoStringUtils.h"
diff --git a/vdo/vdoStringUtils.h b/vdo/vdoStringUtils.h
index 9954fa35..cbae05e0 100644
--- a/vdo/vdoStringUtils.h
+++ b/vdo/vdoStringUtils.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/vdoStringUtils.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/vdoStringUtils.h#6 $
  */
 
 #ifndef VDO_STRING_UTILS_H
diff --git a/vdo/vdoSuspend.c b/vdo/vdoSuspend.c
index 444c9ef8..9211a593 100644
--- a/vdo/vdoSuspend.c
+++ b/vdo/vdoSuspend.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoSuspend.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoSuspend.c#29 $
  */
 
 #include "vdoSuspend.h"
@@ -39,6 +39,7 @@ enum {
 	SUSPEND_PHASE_START = 0,
 	SUSPEND_PHASE_PACKER,
 	SUSPEND_PHASE_DATA_VIOS,
+	SUSPEND_PHASE_FLUSHES,
 	SUSPEND_PHASE_LOGICAL_ZONES,
 	SUSPEND_PHASE_BLOCK_MAP,
 	SUSPEND_PHASE_JOURNAL,
@@ -52,6 +53,7 @@ static const char *SUSPEND_PHASE_NAMES[] = {
 	"SUSPEND_PHASE_START",
 	"SUSPEND_PHASE_PACKER",
 	"SUSPEND_PHASE_DATA_VIOS",
+	"SUSPEND_PHASE_FLUSHES",
 	"SUSPEND_PHASE_LOGICAL_ZONES",
 	"SUSPEND_PHASE_BLOCK_MAP",
 	"SUSPEND_PHASE_JOURNAL",
@@ -71,6 +73,7 @@ get_thread_id_for_phase(struct admin_completion *admin_completion)
 		get_vdo_thread_config(admin_completion->vdo);
 	switch (admin_completion->phase) {
 	case SUSPEND_PHASE_PACKER:
+        case SUSPEND_PHASE_FLUSHES:
 		return thread_config->packer_thread;
 
 	case SUSPEND_PHASE_JOURNAL:
@@ -164,6 +167,11 @@ static void suspend_callback(struct vdo_completion *completion)
 				  reset_vdo_admin_sub_task(completion));
 		return;
 
+	case SUSPEND_PHASE_FLUSHES:
+		vdo_drain_flusher(vdo->flusher,
+				  reset_vdo_admin_sub_task(completion));
+		return;
+
 	case SUSPEND_PHASE_LOGICAL_ZONES:
 		/*
 		 * Attempt to flush all I/O before completing post suspend
diff --git a/vdo/vdoSuspend.h b/vdo/vdoSuspend.h
index 17ae33f1..6ecf1b77 100644
--- a/vdo/vdoSuspend.h
+++ b/vdo/vdoSuspend.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vdoSuspend.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vdoSuspend.h#5 $
  */
 
 #ifndef VDO_SUSPEND_H
diff --git a/vdo/verify.c b/vdo/verify.c
index ac5a5919..aa230311 100644
--- a/vdo/verify.c
+++ b/vdo/verify.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/verify.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/verify.c#10 $
  */
 
 #include "logger.h"
diff --git a/vdo/vio.c b/vdo/vio.c
index 720b6fc7..25d79cdd 100644
--- a/vdo/vio.c
+++ b/vdo/vio.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vio.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vio.c#20 $
  */
 
 #include "vio.h"
diff --git a/vdo/vio.h b/vdo/vio.h
index d8ccd4b0..b5ea4284 100644
--- a/vdo/vio.h
+++ b/vdo/vio.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vio.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vio.h#21 $
  */
 
 #ifndef VIO_H
diff --git a/vdo/vioPool.c b/vdo/vioPool.c
index c6198ec4..bcda2d94 100644
--- a/vdo/vioPool.c
+++ b/vdo/vioPool.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vioPool.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vioPool.c#12 $
  */
 
 #include "vioPool.h"
diff --git a/vdo/vioPool.h b/vdo/vioPool.h
index a365674b..152eb9c0 100644
--- a/vdo/vioPool.h
+++ b/vdo/vioPool.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vioPool.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vioPool.h#6 $
  */
 
 #ifndef VIO_POOL_H
diff --git a/vdo/vioRead.c b/vdo/vioRead.c
index f2f71b04..875a9e00 100644
--- a/vdo/vioRead.c
+++ b/vdo/vioRead.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vioRead.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vioRead.c#17 $
  */
 
 #include "vioRead.h"
diff --git a/vdo/vioRead.h b/vdo/vioRead.h
index 23d77a33..a2982dfe 100644
--- a/vdo/vioRead.h
+++ b/vdo/vioRead.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vioRead.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vioRead.h#4 $
  */
 
 #ifndef VIO_READ_H
diff --git a/vdo/vioWrite.c b/vdo/vioWrite.c
index 41d888f2..09f0b48f 100644
--- a/vdo/vioWrite.c
+++ b/vdo/vioWrite.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vioWrite.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vioWrite.c#39 $
  */
 
 /*
diff --git a/vdo/vioWrite.h b/vdo/vioWrite.h
index dd20eff4..4c5c55e0 100644
--- a/vdo/vioWrite.h
+++ b/vdo/vioWrite.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/vioWrite.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/vioWrite.h#6 $
  */
 
 #ifndef VIO_WRITE_H
diff --git a/vdo/volumeGeometry.c b/vdo/volumeGeometry.c
index b37dad7a..c69137a3 100644
--- a/vdo/volumeGeometry.c
+++ b/vdo/volumeGeometry.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/volumeGeometry.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/volumeGeometry.c#26 $
  */
 
 #include "volumeGeometry.h"
diff --git a/vdo/volumeGeometry.h b/vdo/volumeGeometry.h
index 6768f0d2..8fa6b657 100644
--- a/vdo/volumeGeometry.h
+++ b/vdo/volumeGeometry.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/volumeGeometry.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/volumeGeometry.h#12 $
  */
 
 #ifndef VOLUME_GEOMETRY_H
diff --git a/vdo/waitQueue.c b/vdo/waitQueue.c
index 2c4121ea..5eddaf26 100644
--- a/vdo/waitQueue.c
+++ b/vdo/waitQueue.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/waitQueue.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/waitQueue.c#6 $
  */
 
 #include "waitQueue.h"
diff --git a/vdo/waitQueue.h b/vdo/waitQueue.h
index 4b44d2c0..525b12b4 100644
--- a/vdo/waitQueue.h
+++ b/vdo/waitQueue.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/base/waitQueue.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/base/waitQueue.h#6 $
  */
 
 #ifndef WAIT_QUEUE_H
diff --git a/vdo/workItemStats.c b/vdo/workItemStats.c
index 9ddf3585..50b63285 100644
--- a/vdo/workItemStats.c
+++ b/vdo/workItemStats.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/workItemStats.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/workItemStats.c#7 $
  */
 
 #include "workItemStats.h"
diff --git a/vdo/workItemStats.h b/vdo/workItemStats.h
index 9abe37cb..d1f01e22 100644
--- a/vdo/workItemStats.h
+++ b/vdo/workItemStats.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/workItemStats.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/workItemStats.h#4 $
  */
 
 #ifndef WORK_ITEM_STATS_H
diff --git a/vdo/workQueue.c b/vdo/workQueue.c
index b0f0cd73..3356e923 100644
--- a/vdo/workQueue.c
+++ b/vdo/workQueue.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/workQueue.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/workQueue.c#26 $
  */
 
 #include "workQueue.h"
@@ -436,8 +436,6 @@ static int work_queue_runner(void *ptr)
 	struct simple_work_queue *queue = ptr;
 	unsigned long flags;
 
-	kobject_get(&queue->common.kobj);
-
 	queue->stats.start_time = queue->most_recent_wakeup = ktime_get_ns();
 
 	spin_lock_irqsave(&queue->lock, flags);
@@ -447,7 +445,6 @@ static int work_queue_runner(void *ptr)
 	wake_up(&queue->start_waiters);
 	service_work_queue(queue);
 
-	kobject_put(&queue->common.kobj);
 	return 0;
 }
 
@@ -490,7 +487,6 @@ static bool queue_started(struct simple_work_queue *queue)
  * @param [in]  thread_name_prefix The per-device prefix to use in
  *                                 thread names
  * @param [in]  name               The queue name
- * @param [in]  parent_kobject     The parent sysfs node
  * @param [in]  owner              The VDO owning the work queue
  * @param [in]  private            Private data of the queue for use by work
  *                                 items or other queue-specific functions
@@ -503,7 +499,6 @@ static bool queue_started(struct simple_work_queue *queue)
  **/
 static int make_simple_work_queue(const char *thread_name_prefix,
 				  const char *name,
-				  struct kobject *parent_kobject,
 				  struct vdo *owner,
 				  void *private,
 				  const struct vdo_work_queue_type *type,
@@ -568,15 +563,6 @@ static int make_simple_work_queue(const char *thread_name_prefix,
 	init_waitqueue_head(&queue->start_waiters);
 	spin_lock_init(&queue->lock);
 
-	kobject_init(&queue->common.kobj, &simple_work_queue_kobj_type);
-	result = kobject_add(&queue->common.kobj,
-			     parent_kobject,
-			     queue->common.name);
-	if (result != 0) {
-		uds_log_error("Cannot add sysfs node: %d", result);
-		free_simple_work_queue(queue);
-		return result;
-	}
 	queue->num_priority_lists = num_priority_lists;
 	for (i = 0; i < WORK_QUEUE_PRIORITY_COUNT; i++) {
 		result = make_funnel_queue(&queue->priority_lists[i]);
@@ -585,8 +571,7 @@ static int make_simple_work_queue(const char *thread_name_prefix,
 			return result;
 		}
 	}
-	result =
-		initialize_work_queue_stats(&queue->stats, &queue->common.kobj);
+	result = initialize_work_queue_stats(&queue->stats, NULL);
 	if (result != 0) {
 		uds_log_error("Cannot initialize statistics tracking: %d",
 			      result);
@@ -626,7 +611,6 @@ static int make_simple_work_queue(const char *thread_name_prefix,
 /**********************************************************************/
 int make_work_queue(const char *thread_name_prefix,
 		    const char *name,
-		    struct kobject *parent_kobject,
 		    struct vdo *owner,
 		    void *private,
 		    const struct vdo_work_queue_type *type,
@@ -645,7 +629,6 @@ int make_work_queue(const char *thread_name_prefix,
 							    private;
 		result = make_simple_work_queue(thread_name_prefix,
 					        name,
-					        parent_kobject,
 					        owner,
 					        context,
 					        type,
@@ -682,17 +665,6 @@ int make_work_queue(const char *thread_name_prefix,
 		return -ENOMEM;
 	}
 
-	kobject_init(&queue->common.kobj, &round_robin_work_queue_kobj_type);
-	result = kobject_add(&queue->common.kobj,
-			     parent_kobject,
-			     queue->common.name);
-	if (result != 0) {
-		uds_log_error("Cannot add sysfs node: %d", result);
-		finish_work_queue(&queue->common);
-		kobject_put(&queue->common.kobj);
-		return result;
-	}
-
 	*queue_ptr = &queue->common;
 
 	for (i = 0; i < thread_count; i++) {
@@ -701,7 +673,6 @@ int make_work_queue(const char *thread_name_prefix,
 		snprintf(thread_name, sizeof(thread_name), "%s%u", name, i);
 		result = make_simple_work_queue(thread_name_prefix,
 						thread_name,
-						&queue->common.kobj,
 						owner,
 						context,
 						type,
@@ -783,7 +754,8 @@ static void free_simple_work_queue(struct simple_work_queue *queue)
 		free_funnel_queue(queue->priority_lists[i]);
 	}
 	cleanup_work_queue_stats(&queue->stats);
-	kobject_put(&queue->common.kobj);
+	UDS_FREE(queue->common.name);
+	UDS_FREE(queue);
 }
 
 /**
@@ -804,7 +776,8 @@ static void free_round_robin_work_queue(struct round_robin_work_queue *queue)
 		free_simple_work_queue(queue_table[i]);
 	}
 	UDS_FREE(queue_table);
-	kobject_put(&queue->common.kobj);
+	UDS_FREE(queue->common.name);
+	UDS_FREE(queue);
 }
 
 /**********************************************************************/
diff --git a/vdo/workQueue.h b/vdo/workQueue.h
index 1bfb5077..61942e16 100644
--- a/vdo/workQueue.h
+++ b/vdo/workQueue.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/workQueue.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/workQueue.h#14 $
  */
 
 #ifndef VDO_WORK_QUEUE_H
@@ -135,7 +135,6 @@ struct vdo_work_queue_type {
  * @param [in]  thread_name_prefix  The per-device prefix to use in thread
  *                                  names
  * @param [in]  name                The queue name
- * @param [in]  parent_kobject      The parent sysfs node
  * @param [in]  owner               The VDO owning the work queue
  * @param [in]  private             Private data of the queue for use by work
  *                                  items or other queue-specific functions
@@ -152,7 +151,6 @@ struct vdo_work_queue_type {
  **/
 int make_work_queue(const char *thread_name_prefix,
 		    const char *name,
-		    struct kobject *parent_kobject,
 		    struct vdo *owner,
 		    void *private,
 		    const struct vdo_work_queue_type *type,
diff --git a/vdo/workQueueInternals.h b/vdo/workQueueInternals.h
index 9e9235a8..98765515 100644
--- a/vdo/workQueueInternals.h
+++ b/vdo/workQueueInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/workQueueInternals.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/workQueueInternals.h#8 $
  */
 
 #ifndef WORK_QUEUE_INTERNALS_H
diff --git a/vdo/workQueueStats.c b/vdo/workQueueStats.c
index bf9490fe..df7da77c 100644
--- a/vdo/workQueueStats.c
+++ b/vdo/workQueueStats.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/workQueueStats.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/workQueueStats.c#7 $
  */
 
 #include "workQueueStats.h"
@@ -33,6 +33,10 @@ int initialize_work_queue_stats(struct vdo_work_queue_stats *stats,
 {
 	initialize_vdo_work_item_stats(&stats->work_item_stats);
 
+        if (queue_kobject == NULL) {
+		return 0;
+        }
+
 	stats->queue_time_histogram =
 		make_logarithmic_histogram(queue_kobject, "queue_time",
 					   "Queue Time", "work items",
diff --git a/vdo/workQueueStats.h b/vdo/workQueueStats.h
index a025c563..31164149 100644
--- a/vdo/workQueueStats.h
+++ b/vdo/workQueueStats.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/workQueueStats.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/workQueueStats.h#5 $
  */
 
 #ifndef WORK_QUEUE_STATS_H
diff --git a/vdo/workQueueSysfs.c b/vdo/workQueueSysfs.c
index 099598d4..df452038 100644
--- a/vdo/workQueueSysfs.c
+++ b/vdo/workQueueSysfs.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/workQueueSysfs.c#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/workQueueSysfs.c#5 $
  */
 
 #include "workQueueSysfs.h"
diff --git a/vdo/workQueueSysfs.h b/vdo/workQueueSysfs.h
index 541e85f6..3dd37150 100644
--- a/vdo/workQueueSysfs.h
+++ b/vdo/workQueueSysfs.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/sulfur-rhel9.0-beta/src/c++/vdo/kernel/workQueueSysfs.h#1 $
+ * $Id: //eng/vdo-releases/sulfur/src/c++/vdo/kernel/workQueueSysfs.h#2 $
  */
 
 #ifndef WORK_QUEUE_SYSFS_H