Merge pull request #34 from johnramsden/zfs-2.0.0

Compatibility fixes for ZFS 2.0.0

Author: johnramsden

include/libze/libze.h

@@ -1,6 +1,11 @@
 #ifndef ZECTL_LIBZE_H
 #define ZECTL_LIBZE_H
 
+// Required for spl stat.h
+#define __USE_LARGEFILE64
+#define _LARGEFILE_SOURCE
+#define _LARGEFILE64_SOURCE
+
 #include "libzfs/libzfs.h"
 
 #include <stddef.h>

lib/libze/libze.c

@@ -2643,15 +2643,20 @@ libze_rename(libze_handle *lzeh, char const boot_environment[static 1],
     // Go ahead with rename, checks passed
 
     // No recurse, no create parents
-    if (zfs_rename(be_zh, new_be_ds, B_FALSE, B_FALSE) != 0) {
+    renameflags_t rnf = {
+            .recursive = 0,
+            .nounmount = 1,
+            .forceunmount = 0,
+    };
+    if (zfs_rename(be_zh, new_be_ds, rnf) != 0) {
         ret = libze_error_set(lzeh, LIBZE_ERROR_UNKNOWN,
                               "Rename of boot environment (%s) failed.\n", boot_environment);
         goto err;
     }
 
     if (be_bpool_zh != NULL) {
         // No recurse, no create parents
-        if (zfs_rename(be_bpool_zh, new_be_bpool_ds, B_FALSE, B_FALSE) != 0) {
+        if (zfs_rename(be_bpool_zh, new_be_bpool_ds, rnf) != 0) {
             ret = libze_error_set(lzeh, LIBZE_ERROR_UNKNOWN,
                                   "Rename of boot environment (%s) on bootpool failed.\n",
                                   boot_environment);