Version 8.1.0.1

- Rebased to upstream candidate.
dm-vdo · May 4, 2021 · 1cf3a0b · 1cf3a0b
1 parent 827e5e0
commit 1cf3a0b
Show file tree

Hide file tree

Showing 460 changed files with 32,800 additions and 78,182 deletions.
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -34,10 +34,12 @@ Other Contributors:
     Updates for FC26/Kernel 4.13
   Vojtech Trefny <[email protected]>
     Getting correct size of partitions
-  Achilles Gaikwad <agaikwad@redhat.com>
+  Achilles Gaikwad <achilleg@amazon.com>
     Bash completion for the vdo and vdostats commands
   Jin-young Kwon <[email protected]>
     Adding vdo --version command, and documentation fixes
+  Francisco Vilmar Cardoso Ruviaro <[email protected]>
+    Typo corrections in vdo and uds
 
 VDO was originally created at Permabit Technology Corporation, and was
 subsequently acquired and open-sourced by Red Hat.

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright Red Hat
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA. 
 #
-# $Id: //eng/vdo-releases/aluminum/src/packaging/src-dist/user/Makefile#1 $
+# $Id: //eng/vdo-releases/sulfur/src/packaging/src-dist/user/Makefile#1 $
 
 INSTALL = install
 INSTALLOWNER ?= -o root -g root

diff --git a/examples/Makefile b/examples/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright Red Hat
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA. 
 #
-# $Id: //eng/vdo-releases/aluminum/src/packaging/src-dist/user/examples/Makefile#3 $
+# $Id: //eng/vdo-releases/sulfur/src/packaging/src-dist/user/examples/Makefile#1 $
 
 SUBDIRS = ansible monitor systemd udev
 

diff --git a/examples/ansible/Makefile b/examples/ansible/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright Red Hat
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA. 
 #
-# $Id: //eng/vdo-releases/aluminum/src/packaging/src-dist/user/examples/ansible/Makefile#2 $
+# $Id: //eng/vdo-releases/sulfur/src/packaging/src-dist/user/examples/ansible/Makefile#1 $
 
 INSTALLFILES=README.txt			\
 	test_vdocreate.yml		\

diff --git a/examples/monitor/Makefile b/examples/monitor/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright Red Hat
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA. 
 #
-# $Id: //eng/vdo-releases/aluminum/src/packaging/src-dist/user/examples/monitor/Makefile#1 $
+# $Id: //eng/vdo-releases/sulfur/src/packaging/src-dist/user/examples/monitor/Makefile#1 $
 
 INSTALLFILES=monitor_check_vdostats_logicalSpace.pl	\
 	monitor_check_vdostats_physicalSpace.pl	\

diff --git a/examples/monitor/monitor_check_vdostats_logicalSpace.pl b/examples/monitor/monitor_check_vdostats_logicalSpace.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 ##
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright Red Hat
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -36,7 +36,7 @@
 #
 # The "vdostats" program must be in the path used by "sudo".
 #
-# $Id: //eng/vdo-releases/aluminum/src/tools/monitor/monitor_check_vdostats_logicalSpace.pl#2 $
+# $Id: //eng/vdo-releases/sulfur/src/tools/monitor/monitor_check_vdostats_logicalSpace.pl#1 $
 #
 ##
 

diff --git a/examples/monitor/monitor_check_vdostats_physicalSpace.pl b/examples/monitor/monitor_check_vdostats_physicalSpace.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 ##
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright Red Hat
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -36,7 +36,7 @@
 #
 # The "vdostats" program must be in the path used by "sudo".
 #
-# $Id: //eng/vdo-releases/aluminum/src/tools/monitor/monitor_check_vdostats_physicalSpace.pl#2 $
+# $Id: //eng/vdo-releases/sulfur/src/tools/monitor/monitor_check_vdostats_physicalSpace.pl#1 $
 #
 ##
 

diff --git a/examples/monitor/monitor_check_vdostats_savingPercent.pl b/examples/monitor/monitor_check_vdostats_savingPercent.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 ##
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright Red Hat
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -36,7 +36,7 @@
 #
 # The "vdostats" program must be in the path used by "sudo".
 #
-# $Id: //eng/vdo-releases/aluminum/src/tools/monitor/monitor_check_vdostats_savingPercent.pl#2 $
+# $Id: //eng/vdo-releases/sulfur/src/tools/monitor/monitor_check_vdostats_savingPercent.pl#1 $
 #
 ##
 

diff --git a/examples/systemd/Makefile b/examples/systemd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright Red Hat
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA. 
 #
-# $Id: //eng/vdo-releases/aluminum/src/packaging/src-dist/user/examples/systemd/Makefile#2 $
+# $Id: //eng/vdo-releases/sulfur/src/packaging/src-dist/user/examples/systemd/Makefile#1 $
 
 SERVICEFILE=vdo.service
 EXAMPLEFILES=VDO.mount.example

diff --git a/examples/systemd/vdo.service b/examples/systemd/vdo.service
@@ -1,12 +1,3 @@
 [Unit]
-Description=VDO volume services
-After=systemd-remount-fs.service
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/vdo start --all --confFile /etc/vdoconf.yml
-ExecStop=/usr/bin/vdo stop --all --confFile /etc/vdoconf.yml
-
-[Install]
-WantedBy=multi-user.target
+Description=VDO volume services (provided for compatibility)
+Documentation=man:vdo(8)
diff --git a/examples/udev/Makefile b/examples/udev/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright Red Hat
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA. 
 #
-# $Id: //eng/vdo-releases/aluminum/src/packaging/src-dist/user/examples/udev/Makefile#1 $
+# $Id: //eng/vdo-releases/sulfur/src/packaging/src-dist/user/examples/udev/Makefile#1 $
 
 UDEVFILE=69-vdo-start-by-dev.rules
 

diff --git a/utils/Makefile b/utils/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright Red Hat
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -17,7 +17,7 @@
 # 02110-1301, USA. 
 #
 
-# $Id: //eng/vdo-releases/aluminum/src/packaging/src-dist/user/utils/Makefile#1 $
+# $Id: //eng/vdo-releases/sulfur/src/packaging/src-dist/user/utils/Makefile#1 $
 
 SUBDIRS = uds vdo
 

diff --git a/utils/uds/Makefile b/utils/uds/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Red Hat, Inc.
+# Copyright Red Hat
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -16,13 +16,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA. 
 #
-# $Id: //eng/vdo-releases/aluminum/src/packaging/src-dist/user/utils/uds/Makefile#5 $
+# $Id: //eng/vdo-releases/sulfur/src/packaging/src-dist/user/utils/uds/Makefile#1 $
 
 # UDS_INTERNAL_VERSION is the short version name, which is used to version the
 # UDS interfaces exported from libuds.so.  DISTRIBUTION_VERSION is the long
 # version name used in distribution builds.  We extract these values from the
 # traditional location.
-UDS_VERSION      = 8.0.2.2
+UDS_VERSION      = 8.1.0.247
 BUILD_VERSION    = $(UDS_VERSION)
 DISTRO_CODENAME := $(shell lsb_release -s -c)
 
@@ -62,7 +62,7 @@ GLOBAL_FLAGS   = $(RPM_OPT_FLAGS) -D_GNU_SOURCE -g $(OPT_FLAGS)		\
 		 $(WARNS) $(shell getconf LFS_CFLAGS) $(DEBUG_FLAGS)	\
 		 -DUDS_VERSION='"$(BUILD_VERSION)"'			\
 
-CFLAGS  = $(GLOBAL_FLAGS) -I. -std=c99 $(C_WARNS) -pedantic $(MY_CFLAGS)
+CFLAGS  = $(GLOBAL_FLAGS) -I. -std=gnu99 -pedantic $(C_WARNS) $(MY_CFLAGS)
 LDFLAGS = $(RPM_LD_FLAGS) $(MY_LDFLAGS)
 
 MY_FLAGS    =
@@ -119,13 +119,11 @@ UDS_OBJECTS =	MurmurHash3.o			\
 		memoryAlloc.o			\
 		memoryLinuxUser.o		\
 		minisyslog.o			\
-		numeric.o			\
 		nonce.o				\
 		openChapter.o			\
 		openChapterZone.o		\
 		pageCache.o			\
 		permassert.o			\
-		permassertLinuxUser.o		\
 		radixSort.o			\
 		random.o			\
 		recordPage.o			\

diff --git a/utils/uds/atomicDefs.h b/utils/uds/atomicDefs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Red Hat, Inc.
+ * Copyright Red Hat
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -16,17 +16,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA. 
  *
- * $Id: //eng/uds-releases/jasper/userLinux/uds/atomicDefs.h#1 $
+ * $Id: //eng/uds-releases/krusty/src/uds/atomicDefs.h#3 $
  */
 
-#ifndef LINUX_USER_ATOMIC_DEFS_H
-#define LINUX_USER_ATOMIC_DEFS_H
+#ifndef ATOMIC_DEFS_H
+#define ATOMIC_DEFS_H
+
 
 #include "compiler.h"
 #include "typeDefs.h"
 
 // The atomic interfaces are chosen to exactly match those interfaces defined
-// by the Linux kernel.  This is the matching user-mode implementation.
+// by the Linux kernel.  The rest of this file is the matching user-mode
+// implementation.
 
 typedef struct {
   int32_t value;
@@ -152,31 +154,30 @@ static INLINE void smp_wmb(void)
 }
 
 /**
- * Provide a memory barrier before an atomic operation.
+ * Provide a memory barrier before an atomic read-modify-write operation
+ * that does not imply one.
  **/
 static INLINE void smp_mb__before_atomic(void)
 {
+#if defined(__x86_64__) || defined(__s390__)
+  // Atomic operations are already serializing on x86 and s390
+  barrier();
+#else
   smp_mb();
+#endif
 }
 
 /**
- * Provide a read barrier, if needed, between dependent reads.
- *
- * On most architectures, a read issued using a memory location that was
- * itself read from memory (or derived from something read from memory) cannot
- * pick up "stale" data if the data was written out before the pointer itself
- * was saved and proper write fencing was used. On one or two, like the Alpha,
- * a barrier is needed between the reads to ensure that proper cache
- * invalidation happens.
+ * Provide a memory barrier after an atomic read-modify-write operation
+ * that does not imply one.
  **/
-static INLINE void smp_read_barrier_depends(void)
+static INLINE void smp_mb__after_atomic(void)
 {
-#if defined(__x86_64__) || defined(__PPC__) || defined(__s390__) \
-  || defined(__aarch64__)
-  // Nothing needed for these architectures.
+#if defined(__x86_64__) || defined(__s390__)
+  // Atomic operations are already serializing on x86 and s390
+  barrier();
 #else
-  // Default to playing it safe.
-  rmb();
+  smp_mb();
 #endif
 }
 
@@ -486,4 +487,4 @@ static INLINE void atomic64_set_release(atomic64_t *atom, long value)
     __xchg_result;                                                      \
   })
 
-#endif /* LINUX_USER_ATOMIC_DEFS_H */
+#endif /* ATOMIC_DEFS_H */