Merge pull request openzfs#64 from truenas/revert-59-NAS-115872-22.12

Revert "NAS-115872 / ZFS send: Fix -V operation for Linux"
anodos325 · Apr 28, 2022 · 4761136 · 4761136
2 parents b10fed9 + 8d17352
commit 4761136
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 18 deletions.
diff --git a/.github/workflows/checkstyle.yaml b/.github/workflows/checkstyle.yaml
@@ -15,7 +15,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install --yes -qq build-essential autoconf libtool gawk alien fakeroot linux-headers-$(uname -r)
-        sudo apt-get install --yes -qq zlib1g-dev uuid-dev libattr1-dev libblkid-dev libselinux-dev libudev-dev libssl-dev libbsd-dev python-dev python-setuptools python-cffi python3 python3-dev python3-setuptools python3-cffi
+        sudo apt-get install --yes -qq zlib1g-dev uuid-dev libattr1-dev libblkid-dev libselinux-dev libudev-dev libssl-dev python-dev python-setuptools python-cffi python3 python3-dev python3-setuptools python3-cffi
         # packages for tests
         sudo apt-get install --yes -qq parted lsscsi ksh attr acl nfs-kernel-server fio
         sudo apt-get install --yes -qq mandoc cppcheck pax-utils devscripts

diff --git a/.github/workflows/zfs-tests-functional.yml b/.github/workflows/zfs-tests-functional.yml
@@ -25,7 +25,7 @@ jobs:
           zlib1g-dev uuid-dev libblkid-dev libselinux-dev \
           xfslibs-dev libattr1-dev libacl1-dev libudev-dev libdevmapper-dev \
           libssl-dev libffi-dev libaio-dev libelf-dev libmount-dev \
-          libpam0g-dev libbsd-dev pamtester python-dev python-setuptools python-cffi \
+          libpam0g-dev pamtester python-dev python-setuptools python-cffi \
           python3 python3-dev python3-setuptools python3-cffi python3-packaging \
           libcurl4-openssl-dev
     - name: Autogen.sh

diff --git a/.github/workflows/zfs-tests-sanity.yml b/.github/workflows/zfs-tests-sanity.yml
@@ -21,7 +21,7 @@ jobs:
           zlib1g-dev uuid-dev libblkid-dev libselinux-dev \
           xfslibs-dev libattr1-dev libacl1-dev libudev-dev libdevmapper-dev \
           libssl-dev libffi-dev libaio-dev libelf-dev libmount-dev \
-          libpam0g-dev libbsd-dev pamtester python-dev python-setuptools python-cffi \
+          libpam0g-dev pamtester python-dev python-setuptools python-cffi \
           python3 python3-dev python3-setuptools python3-cffi python3-packaging \
           libcurl4-openssl-dev
     - name: Autogen.sh

diff --git a/.github/workflows/zloop.yml b/.github/workflows/zloop.yml
@@ -21,7 +21,7 @@ jobs:
           zlib1g-dev uuid-dev libblkid-dev libselinux-dev \
           xfslibs-dev libattr1-dev libacl1-dev libudev-dev libdevmapper-dev \
           libssl-dev libffi-dev libaio-dev libelf-dev libmount-dev \
-          libpam0g-dev libbsd-dev \
+          libpam0g-dev \
           python-dev python-setuptools python-cffi python-packaging \
           python3 python3-dev python3-setuptools python3-cffi python3-packaging
     - name: Autogen.sh

diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
@@ -8698,13 +8698,6 @@ main(int argc, char **argv)
 
 	libzfs_print_on_error(g_zfs, B_TRUE);
 
-#ifdef __linux__
-#ifdef HAVE_PROCTITLE
-	extern char **environ;
-	setproctitle_init(argc, argv, environ);
-#endif
-#endif
-
 	/*
 	 * Many commands modify input strings for string parsing reasons.
 	 * We create a copy to protect the original argv.

diff --git a/contrib/truenas/control b/contrib/truenas/control
@@ -2,7 +2,7 @@ Source: openzfs
 Maintainer: Ryan Moeller <[email protected]>
 Section: truenas
 Priority: extra
-Build-Depends: build-essential, autoconf, automake, libtool, gawk, alien, fakeroot, libblkid-dev, uuid-dev, libudev-dev, libssl-dev, zlib1g-dev, libaio-dev, libattr1-dev, libelf-dev, linux-image-amd64, linux-headers-amd64, python3, python3-dev, python3-setuptools, python3-cffi, python3-packaging, python3-distlib, libffi-dev, libbsd-dev
+Build-Depends: build-essential, autoconf, automake, libtool, gawk, alien, fakeroot, libblkid-dev, uuid-dev, libudev-dev, libssl-dev, zlib1g-dev, libaio-dev, libattr1-dev, libelf-dev, linux-image-amd64, linux-headers-amd64, python3, python3-dev, python3-setuptools, python3-cffi, python3-packaging, python3-distlib, libffi-dev
 
 Package: openzfs
 Architecture: amd64

diff --git a/lib/libuutil/libuutil.abi b/lib/libuutil/libuutil.abi
@@ -1,6 +1,5 @@
 <abi-corpus version='2.0' architecture='elf-amd-x86_64' soname='libuutil.so.3'>
   <elf-needed>
-    <dependency name='libbsd.so.0'/>
     <dependency name='libpthread.so.0'/>
     <dependency name='libc.so.6'/>
     <dependency name='ld-linux-x86-64.so.2'/>
@@ -176,6 +175,8 @@
     <elf-symbol name='mkdirp' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='print_timestamp' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='spl_pagesize' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='strlcat' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='strlcpy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='uu_alt_exit' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='uu_avl_create' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='uu_avl_destroy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -984,10 +985,26 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='page.c' language='LANG_C99'>
+    <var-decl name='pagesize' type-id='b59d7dce' mangled-name='pagesize' visibility='default' elf-symbol-id='pagesize'/>
     <function-decl name='spl_pagesize' mangled-name='spl_pagesize' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='spl_pagesize'>
       <return type-id='b59d7dce'/>
     </function-decl>
-    <var-decl name='pagesize' type-id='b59d7dce' mangled-name='pagesize' visibility='default' elf-symbol-id='pagesize'/>
+  </abi-instr>
+  <abi-instr address-size='64' path='strlcat.c' language='LANG_C99'>
+    <function-decl name='strlcat' mangled-name='strlcat' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strlcat'>
+      <parameter type-id='26a90f95' name='dst'/>
+      <parameter type-id='80f4b756' name='src'/>
+      <parameter type-id='b59d7dce' name='dstsize'/>
+      <return type-id='b59d7dce'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr address-size='64' path='strlcpy.c' language='LANG_C99'>
+    <function-decl name='strlcpy' mangled-name='strlcpy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strlcpy'>
+      <parameter type-id='26a90f95' name='dst'/>
+      <parameter type-id='80f4b756' name='src'/>
+      <parameter type-id='b59d7dce' name='len'/>
+      <return type-id='b59d7dce'/>
+    </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='timestamp.c' language='LANG_C99'>
     <function-decl name='print_timestamp' mangled-name='print_timestamp' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='print_timestamp'>

diff --git a/lib/libzfs/libzfs.abi b/lib/libzfs/libzfs.abi
@@ -6,7 +6,6 @@
     <dependency name='libcrypto.so.1.1'/>
     <dependency name='libz.so.1'/>
     <dependency name='libm.so.6'/>
-    <dependency name='libbsd.so.0'/>
     <dependency name='libpthread.so.0'/>
     <dependency name='libc.so.6'/>
   </elf-needed>

diff --git a/lib/libzfs_core/libzfs_core.abi b/lib/libzfs_core/libzfs_core.abi
@@ -7,7 +7,6 @@
     <dependency name='libblkid.so.1'/>
     <dependency name='libudev.so.1'/>
     <dependency name='libnvpair.so.3'/>
-    <dependency name='libbsd.so.0'/>
     <dependency name='libpthread.so.0'/>
     <dependency name='libc.so.6'/>
     <dependency name='ld-linux-x86-64.so.2'/>
@@ -245,6 +244,8 @@
     <elf-symbol name='print_timestamp' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='slice_cache_compare' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='spl_pagesize' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='strlcat' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='strlcpy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='tpool_abandon' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='tpool_create' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='tpool_destroy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -1286,10 +1287,26 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='page.c' language='LANG_C99'>
+    <var-decl name='pagesize' type-id='b59d7dce' mangled-name='pagesize' visibility='default' elf-symbol-id='pagesize'/>
     <function-decl name='spl_pagesize' mangled-name='spl_pagesize' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='spl_pagesize'>
       <return type-id='b59d7dce'/>
     </function-decl>
-    <var-decl name='pagesize' type-id='b59d7dce' mangled-name='pagesize' visibility='default' elf-symbol-id='pagesize'/>
+  </abi-instr>
+  <abi-instr address-size='64' path='strlcat.c' language='LANG_C99'>
+    <function-decl name='strlcat' mangled-name='strlcat' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strlcat'>
+      <parameter type-id='26a90f95' name='dst'/>
+      <parameter type-id='80f4b756' name='src'/>
+      <parameter type-id='b59d7dce' name='dstsize'/>
+      <return type-id='b59d7dce'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr address-size='64' path='strlcpy.c' language='LANG_C99'>
+    <function-decl name='strlcpy' mangled-name='strlcpy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strlcpy'>
+      <parameter type-id='26a90f95' name='dst'/>
+      <parameter type-id='80f4b756' name='src'/>
+      <parameter type-id='b59d7dce' name='len'/>
+      <return type-id='b59d7dce'/>
+    </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='timestamp.c' language='LANG_C99'>
     <function-decl name='print_timestamp' mangled-name='print_timestamp' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='print_timestamp'>

diff --git a/tests/zfs-tests/cmd/getversion/getversion.c b/tests/zfs-tests/cmd/getversion/getversion.c
@@ -18,7 +18,6 @@
  * Linux exposes it instead through an ioctl.
  */
 
-#include <sys/mount.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <linux/fs.h>