Merge pull request #267 from truenas/dragonfish/zfs-2.2.4-staging

zpool_add API changed in upstream zfs
truenas · May 8, 2024 · 8e795ff · 8e795ff
2 parents 9d4a96c + 0dee35a
commit 8e795ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/libzfs.pyx b/libzfs.pyx
@@ -3175,13 +3175,14 @@ cdef class ZFSPool(object):
             hopts = self.root.generate_history_opts(fsopts, '-o')
             self.root.write_history('zfs create', hopts, name)
 
-    def attach_vdevs(self, vdevs_tree):
+    def attach_vdevs(self, vdevs_tree, check_ashift=0):
         cdef const char *command = 'zpool add'
         cdef ZFSVdev vd = self.root.make_vdev_tree(vdevs_tree, {'ashift': self.properties['ashift'].parsed})
         cdef int ret
+        cdef boolean_t ashift = check_ashift
 
         with nogil:
-            ret = libzfs.zpool_add(self.handle, vd.nvlist.handle)
+            ret = libzfs.zpool_add(self.handle, vd.nvlist.handle, ashift)
 
         if ret != 0:
             raise self.root.get_error()

diff --git a/pxd/libzfs.pxd b/pxd/libzfs.pxd
@@ -227,7 +227,7 @@ cdef extern from "libzfs.h" nogil:
     extern int zpool_create(libzfs_handle_t *, const char *, nvpair.nvlist_t *,
         nvpair.nvlist_t *, nvpair.nvlist_t *)
     extern int zpool_destroy(zpool_handle_t *, const char *)
-    extern int zpool_add(zpool_handle_t *, nvpair.nvlist_t *)
+    extern int zpool_add(zpool_handle_t *, nvpair.nvlist_t *, boolean_t)
 
     IF HAVE_ZPOOL_SCAN == 3:
         extern int zpool_scan(zpool_handle_t *, zfs.pool_scan_func_t, zfs.pool_scrub_cmd_t)