5882 Temporary pool names
Reviewed by: Matt Ahrens <matt@delphix.com>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Approved by: Dan McDonald <danmcd@joyent.com>

@@ -208,10 +208,11 @@
         ZPOOL_PROP_FRAGMENTATION,
         ZPOOL_PROP_LEAKED,
         ZPOOL_PROP_MAXBLOCKSIZE,
         ZPOOL_PROP_BOOTSIZE,
         ZPOOL_PROP_CHECKPOINT,
+        ZPOOL_PROP_TNAME,
         ZPOOL_NUM_PROPS
 } zpool_prop_t;
 
 /* Small enough to not hog a whole line of printout in zpool(1M). */
 #define ZPROP_MAX_COMMENT       32

@@ -1059,10 +1060,11 @@
 #define ZFS_IMPORT_VERBATIM     0x1
 #define ZFS_IMPORT_ANY_HOST     0x2
 #define ZFS_IMPORT_MISSING_LOG  0x4
 #define ZFS_IMPORT_ONLY         0x8
 #define ZFS_IMPORT_CHECKPOINT   0x10
+#define ZFS_IMPORT_TEMP_NAME    0x20
 
 /*
  * Channel program argument/return nvlist keys and defaults.
  */
 #define ZCP_ARG_PROGRAM         "program"