updates libzfs + zfs files to report trim status as originally intended

Author: JordanKeo45

libzfs.pyx

@@ -2078,7 +2078,13 @@ cdef class ZFSVdevStats(object):
             'size': self.size,
             'allocated': self.allocated,
             'fragmentation': self.fragmentation,
-            'self_healed': self.self_healed
+            'self_healed': self.self_healed,
+            'trim_action_time': self.trim_action_time,
+            'trim_bytes_done': self.trim_bytes_done,
+            'trim_bytes_est': self.trim_bytes_est,
+            'trim_errors': self.trim_errors,
+            'trim_notsup': self.trim_notsup,
+            'trim_state': self.trim_state
         }
         IF HAVE_ZFS_VDEV_STAT_ASHIFT:
             state.update({
@@ -2154,6 +2160,30 @@ cdef class ZFSVdevStats(object):
             # This is in bytes
             return self.vs.vs_self_healed
 
+    property trim_action_time:
+        def __get__(self):
+            return self.vs.vs_trim_action_time
+
+    property trim_bytes_done:
+        def __get__(self):
+            return self.vs.vs_trim_bytes_done
+
+    property trim_bytes_est:
+        def __get__(self):
+            return self.vs.vs_trim_bytes_est
+
+    property trim_errors:
+        def __get__(self):
+            return self.vs.vs_trim_errors
+
+    property trim_notsup:
+        def __get__(self):
+            return self.vs.vs_trim_notsup
+
+    property trim_state:
+        def __get__(self):
+            return self.vs.vs_trim_state
+
 
 cdef class ZFSVdev(object):
     cdef readonly ZFSPool zpool

pxd/zfs.pxd

@@ -514,6 +514,12 @@ cdef extern from "sys/fs/zfs.h" nogil:
         uint64_t	vs_logical_ashift
         uint64_t	vs_physical_ashift
         uint64_t	vs_fragmentation
+        uint64_t	vs_trim_errors
+        uint64_t	vs_trim_notsup
+        uint64_t	vs_trim_bytes_done
+        uint64_t	vs_trim_bytes_est
+        uint64_t	vs_trim_state
+        uint64_t	vs_trim_action_time
 
     ctypedef struct pool_scan_stat_t:
         uint64_t    pss_func # pool_scan_func_t