Imported Upstream version 0.6.4.2

[mirror_zfs-debian.git] / include / sys / dmu_objset.h

diff --git a/include/sys/dmu_objset.h b/include/sys/dmu_objset.h
index edf362f7f702e86712ac29463d9c6f998e9910cf..cbf0394e6db173b3b4a3c8c6a23de283c6a204a7 100644 (file)
--- a/include/sys/dmu_objset.h
+++ b/include/sys/dmu_objset.h
@@ -21,7 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  */
 
 /* Portions Copyright 2010 Robert Milkowski */
@@ -85,15 +85,16 @@ struct objset {
        zilog_t *os_zil;
 
        /* can change, under dsl_dir's locks: */
-       uint8_t os_checksum;
-       uint8_t os_compress;
+       enum zio_checksum os_checksum;
+       enum zio_compress os_compress;
        uint8_t os_copies;
-       uint8_t os_dedup_checksum;
-       uint8_t os_dedup_verify;
-       uint8_t os_logbias;
-       uint8_t os_primary_cache;
-       uint8_t os_secondary_cache;
-       uint8_t os_sync;
+       enum zio_checksum os_dedup_checksum;
+       boolean_t os_dedup_verify;
+       zfs_logbias_op_t os_logbias;
+       zfs_cache_type_t os_primary_cache;
+       zfs_cache_type_t os_secondary_cache;
+       zfs_sync_type_t os_sync;
+       zfs_redundant_metadata_type_t os_redundant_metadata;
 
        /* no lock needed: */
        struct dmu_tx *os_synctx; /* XXX sketchy */