Version 6.1.1.125

- Fixed a hang when recovering a VDO volume with a physical size larger than 16TB.
dm-vdo · Sep 14, 2018 · be8e141 · be8e141
1 parent 3017cda
commit be8e141
Show file tree

Hide file tree

Showing 254 changed files with 262 additions and 261 deletions.
diff --git a/kvdo.spec b/kvdo.spec
@@ -1,7 +1,7 @@
 %define spec_release 1
 
 %define kmod_name		kvdo
-%define kmod_driver_version	6.1.1.120
+%define kmod_driver_version	6.1.1.125
 %define kmod_rpm_release	%{spec_release}
 %define kmod_kernel_version	3.10.0-693.el7
 %define kmod_headers_version	%(rpm -qa kernel-devel | sed 's/^kernel-devel-//')
@@ -215,5 +215,5 @@ install -m 644 -D $PWD/obj/%{kmod_kbuild_dir}/Module.symvers $RPM_BUILD_ROOT/usr
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Sun Jul 29 2018 - J. corwin Coburn <[email protected]> - 6.1.1.120-1
-HASH(0x22256f8)
+* Fri Sep 14 2018 - J. corwin Coburn <[email protected]> - 6.1.1.125-1
+HASH(0x18fdb28)
diff --git a/uds/Makefile b/uds/Makefile
@@ -1,4 +1,4 @@
-UDS_VERSION = 6.1.1.26
+UDS_VERSION = 6.1.1.27
 
 SOURCES =  $(notdir $(wildcard $(src)/*.c)) murmur/MurmurHash3.c
 SOURCES += $(addprefix util/,$(notdir $(wildcard $(src)/util/*.c)))

diff --git a/uds/indexInternals.c b/uds/indexInternals.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/flanders/src/uds/indexInternals.c#2 $
+ * $Id: //eng/uds-releases/flanders/src/uds/indexInternals.c#3 $
  */
 
 #include "indexInternals.h"
@@ -60,12 +60,12 @@ int allocateIndex(IndexLayout          *layout,
       return result;
     }
     result = formatVolume(region, config->geometry);
+    int closeResult = closeIORegion(&region);
     if (result != UDS_SUCCESS) {
       return result;
     }
-    result = closeIORegion(&region);
-    if (result != UDS_SUCCESS) {
-      return result;
+    if (closeResult != UDS_SUCCESS) {
+      return closeResult;
     }
   }
 

diff --git a/vdo/Makefile b/vdo/Makefile
@@ -1,4 +1,4 @@
-VDO_VERSION = 6.1.1.120
+VDO_VERSION = 6.1.1.125
 
 VDO_VERSION_MAJOR = $(word 1,$(subst ., ,$(VDO_VERSION)))
 VDO_VERSION_MINOR = $(word 2,$(subst ., ,$(VDO_VERSION)))

diff --git a/vdo/base/adminCompletion.c b/vdo/base/adminCompletion.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/adminCompletion.c#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/adminCompletion.c#1 $
  */
 
 #include "adminCompletion.h"

diff --git a/vdo/base/adminCompletion.h b/vdo/base/adminCompletion.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/adminCompletion.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/adminCompletion.h#1 $
  */
 
 #ifndef ADMIN_COMPLETION_H

diff --git a/vdo/base/allocatingVIO.c b/vdo/base/allocatingVIO.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/allocatingVIO.c#5 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/allocatingVIO.c#1 $
  */
 
 #include "allocatingVIO.h"

diff --git a/vdo/base/allocatingVIO.h b/vdo/base/allocatingVIO.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/allocatingVIO.h#2 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/allocatingVIO.h#1 $
  */
 
 #ifndef ALLOCATING_VIO_H

diff --git a/vdo/base/blockAllocator.c b/vdo/base/blockAllocator.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockAllocator.c#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockAllocator.c#1 $
  */
 
 #include "blockAllocatorInternals.h"

diff --git a/vdo/base/blockAllocator.h b/vdo/base/blockAllocator.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockAllocator.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockAllocator.h#1 $
  */
 
 #ifndef BLOCK_ALLOCATOR_H

diff --git a/vdo/base/blockAllocatorInternals.h b/vdo/base/blockAllocatorInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockAllocatorInternals.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockAllocatorInternals.h#1 $
  */
 
 #ifndef BLOCK_ALLOCATOR_INTERNALS_H

diff --git a/vdo/base/blockDescriptor.h b/vdo/base/blockDescriptor.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockDescriptor.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockDescriptor.h#1 $
  */
 
 #ifndef BLOCK_DESCRIPTOR_H

diff --git a/vdo/base/blockMap.c b/vdo/base/blockMap.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockMap.c#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockMap.c#1 $
  */
 
 #include "blockMap.h"

diff --git a/vdo/base/blockMap.h b/vdo/base/blockMap.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockMap.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockMap.h#1 $
  */
 
 #ifndef BLOCK_MAP_H

diff --git a/vdo/base/blockMapEntry.h b/vdo/base/blockMapEntry.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockMapEntry.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockMapEntry.h#1 $
  */
 
 #ifndef BLOCK_MAP_ENTRY_H

diff --git a/vdo/base/blockMapInternals.h b/vdo/base/blockMapInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockMapInternals.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockMapInternals.h#1 $
  */
 
 #ifndef BLOCK_MAP_INTERNALS_H

diff --git a/vdo/base/blockMapPage.c b/vdo/base/blockMapPage.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockMapPage.c#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockMapPage.c#1 $
  */
 
 #include "blockMapPage.h"

diff --git a/vdo/base/blockMapPage.h b/vdo/base/blockMapPage.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockMapPage.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockMapPage.h#1 $
  */
 
 #ifndef BLOCK_MAP_PAGE_H

diff --git a/vdo/base/blockMapRecovery.c b/vdo/base/blockMapRecovery.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockMapRecovery.c#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockMapRecovery.c#2 $
  */
 
 #include "blockMapRecovery.h"
@@ -392,13 +392,14 @@ static void fetchPage(BlockMapRecoveryCompletion *recovery,
   }
 
   // Fetch the next page we haven't yet requested.
-  PageNumber newPageNumber = recovery->currentUnfetchedEntry->blockMapSlot.pbn;
+  PhysicalBlockNumber newPBN
+    = recovery->currentUnfetchedEntry->blockMapSlot.pbn;
   recovery->currentUnfetchedEntry
     = findEntryStartingNextPage(recovery, recovery->currentUnfetchedEntry,
                                 true);
   initVDOPageCompletion(((VDOPageCompletion *) completion),
                         recovery->blockMap->zones[0].pageCache,
-                        newPageNumber, true, &recovery->completion,
+                        newPBN, true, &recovery->completion,
                         pageLoaded, handlePageLoadError);
   recovery->outstanding++;
   getVDOPageAsync(completion);

diff --git a/vdo/base/blockMapRecovery.h b/vdo/base/blockMapRecovery.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockMapRecovery.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockMapRecovery.h#1 $
  */
 
 #ifndef BLOCK_MAP_RECOVERY_H

diff --git a/vdo/base/blockMapTree.c b/vdo/base/blockMapTree.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockMapTree.c#2 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockMapTree.c#1 $
  */
 
 #include "blockMapTree.h"

diff --git a/vdo/base/blockMapTree.h b/vdo/base/blockMapTree.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockMapTree.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockMapTree.h#1 $
  */
 
 #ifndef BLOCK_MAP_TREE_H

diff --git a/vdo/base/blockMapTreeInternals.h b/vdo/base/blockMapTreeInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockMapTreeInternals.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockMapTreeInternals.h#1 $
  */
 
 #ifndef BLOCK_MAP_TREE_INTERNALS_H

diff --git a/vdo/base/blockMappingState.h b/vdo/base/blockMappingState.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/blockMappingState.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/blockMappingState.h#1 $
  */
 
 #ifndef BLOCK_MAPPING_STATE_H

diff --git a/vdo/base/completion.c b/vdo/base/completion.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/completion.c#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/completion.c#1 $
  */
 
 #include "completion.h"

diff --git a/vdo/base/completion.h b/vdo/base/completion.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/completion.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/completion.h#1 $
  */
 
 #ifndef COMPLETION_H

diff --git a/vdo/base/compressedBlock.c b/vdo/base/compressedBlock.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/compressedBlock.c#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/compressedBlock.c#1 $
  */
 
 #include "compressedBlock.h"

diff --git a/vdo/base/compressedBlock.h b/vdo/base/compressedBlock.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/compressedBlock.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/compressedBlock.h#1 $
  */
 
 #ifndef COMPRESSED_BLOCK_H

diff --git a/vdo/base/compressionState.c b/vdo/base/compressionState.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/compressionState.c#3 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/compressionState.c#1 $
  */
 
 #include "compressionStateInternals.h"

diff --git a/vdo/base/compressionState.h b/vdo/base/compressionState.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/compressionState.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/compressionState.h#1 $
  */
 
 #ifndef COMPRESSION_STATE_H

diff --git a/vdo/base/compressionStateInternals.h b/vdo/base/compressionStateInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/compressionStateInternals.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/compressionStateInternals.h#1 $
  */
 
 #ifndef COMPRESSION_STATE_INTERNALS_H

diff --git a/vdo/base/constants.c b/vdo/base/constants.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/constants.c#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/constants.c#1 $
  */
 
 #include "types.h"

diff --git a/vdo/base/constants.h b/vdo/base/constants.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/constants.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/constants.h#1 $
  */
 
 #ifndef CONSTANTS_H

diff --git a/vdo/base/dataVIO.c b/vdo/base/dataVIO.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/dataVIO.c#5 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/dataVIO.c#1 $
  */
 
 #include "dataVIO.h"

diff --git a/vdo/base/dataVIO.h b/vdo/base/dataVIO.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/dataVIO.h#6 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/dataVIO.h#1 $
  */
 
 #ifndef DATA_VIO_H

diff --git a/vdo/base/dirtyLists.c b/vdo/base/dirtyLists.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/dirtyLists.c#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/dirtyLists.c#1 $
  */
 
 #include "dirtyLists.h"

diff --git a/vdo/base/dirtyLists.h b/vdo/base/dirtyLists.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/dirtyLists.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/dirtyLists.h#1 $
  */
 
 #ifndef DIRTY_LISTS_H

diff --git a/vdo/base/dirtyListsInternals.h b/vdo/base/dirtyListsInternals.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/dirtyListsInternals.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/dirtyListsInternals.h#1 $
  */
 
 #ifndef DIRTY_LISTS_INTERNALS_H

diff --git a/vdo/base/extent.c b/vdo/base/extent.c
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/extent.c#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/extent.c#1 $
  */
 
 #include "extent.h"

diff --git a/vdo/base/extent.h b/vdo/base/extent.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/vdo-releases/magnesium/src/c++/vdo/base/extent.h#1 $
+ * $Id: //eng/vdo-releases/magnesium-rhel7.6/src/c++/vdo/base/extent.h#1 $
  */
 
 #ifndef EXTENT_H