Add conditional chkconfig to packaging

[zfs.git] / include / sys / zfs_ctldir.h

diff --git a/include/sys/zfs_ctldir.h b/include/sys/zfs_ctldir.h
index e598529..1ff23a2 100644 (file)
--- a/include/sys/zfs_ctldir.h
+++ b/include/sys/zfs_ctldir.h
@@ -50,7 +50,7 @@ typedef struct {
        char                    *se_name;
        char                    *se_path;
        struct inode            *se_inode;
-       struct delayed_work     se_work;
+       taskqid_t               se_taskqid;
        avl_node_t              se_node;
 } zfs_snapentry_t;
 
@@ -103,10 +103,10 @@ extern void zfsctl_fini(void);
  * However, they should be as large as possible to avoid conflicts
  * with the objects which are assigned monotonically by the dmu.
  */
-#define        ZFSCTL_INO_ROOT         0x0000FFFFFFFFFFFF
-#define        ZFSCTL_INO_SHARES       0x0000FFFFFFFFFFFE
-#define        ZFSCTL_INO_SNAPDIR      0x0000FFFFFFFFFFFD
-#define        ZFSCTL_INO_SNAPDIRS     0x0000FFFFFFFFFFFC
+#define        ZFSCTL_INO_ROOT         0x0000FFFFFFFFFFFFULL
+#define        ZFSCTL_INO_SHARES       0x0000FFFFFFFFFFFEULL
+#define        ZFSCTL_INO_SNAPDIR      0x0000FFFFFFFFFFFDULL
+#define        ZFSCTL_INO_SNAPDIRS     0x0000FFFFFFFFFFFCULL
 
 #define        ZFSCTL_EXPIRE_SNAPSHOT  300