git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Illumos #1949, #1953
[zfs.git]
/
include
/
sys
/
fs
/
zfs.h
diff --git
a/include/sys/fs/zfs.h
b/include/sys/fs/zfs.h
index
44aed13
..
032a952
100644
(file)
--- a/
include/sys/fs/zfs.h
+++ b/
include/sys/fs/zfs.h
@@
-21,6
+21,8
@@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
*/
/* Portions Copyright 2010 Robert Milkowski */
*/
/* Portions Copyright 2010 Robert Milkowski */
@@
-122,6
+124,7
@@
typedef enum {
ZFS_PROP_DEDUP,
ZFS_PROP_MLSLABEL,
ZFS_PROP_SYNC,
ZFS_PROP_DEDUP,
ZFS_PROP_MLSLABEL,
ZFS_PROP_SYNC,
+ ZFS_PROP_REFRATIO,
ZFS_NUM_PROPS
} zfs_prop_t;
ZFS_NUM_PROPS
} zfs_prop_t;
@@
-161,6
+164,7
@@
typedef enum {
ZPOOL_PROP_FREE,
ZPOOL_PROP_ALLOCATED,
ZPOOL_PROP_READONLY,
ZPOOL_PROP_FREE,
ZPOOL_PROP_ALLOCATED,
ZPOOL_PROP_READONLY,
+ ZPOOL_PROP_ASHIFT,
ZPOOL_NUM_PROPS
} zpool_prop_t;
ZPOOL_NUM_PROPS
} zpool_prop_t;
@@
-306,6
+310,11
@@
typedef enum {
ZFS_SYNC_DISABLED = 2
} zfs_sync_type_t;
ZFS_SYNC_DISABLED = 2
} zfs_sync_type_t;
+typedef enum {
+ ZFS_XATTR_OFF = 0,
+ ZFS_XATTR_DIR = 1,
+ ZFS_XATTR_SA = 2
+} zfs_xattr_type_t;
/*
* On-disk version number.
/*
* On-disk version number.
@@
-778,6
+787,7
@@
typedef enum zfs_ioc {
ZFS_IOC_DIFF,
ZFS_IOC_TMP_SNAPSHOT,
ZFS_IOC_OBJ_TO_STATS,
ZFS_IOC_DIFF,
ZFS_IOC_TMP_SNAPSHOT,
ZFS_IOC_OBJ_TO_STATS,
+ ZFS_IOC_POOL_REGUID,
ZFS_IOC_EVENTS_NEXT,
ZFS_IOC_EVENTS_CLEAR,
} zfs_ioc_t;
ZFS_IOC_EVENTS_NEXT,
ZFS_IOC_EVENTS_CLEAR,
} zfs_ioc_t;
@@
-785,7
+795,7
@@
typedef enum zfs_ioc {
/*
* zvol ioctl to get dataset name
*/
/*
* zvol ioctl to get dataset name
*/
-#define BLKZNAME _IO
(0x12,125
)
+#define BLKZNAME _IO
R(0x12,125,char[ZFS_MAXNAMELEN]
)
/*
* Internal SPA load state. Used by FMA diagnosis engine.
/*
* Internal SPA load state. Used by FMA diagnosis engine.
@@
-847,6
+857,7
@@
typedef enum {
* ESC_ZFS_RESILVER_START
* ESC_ZFS_RESILVER_END
* ESC_ZFS_POOL_DESTROY
* ESC_ZFS_RESILVER_START
* ESC_ZFS_RESILVER_END
* ESC_ZFS_POOL_DESTROY
+ * ESC_ZFS_POOL_REGUID
*
* ZFS_EV_POOL_NAME DATA_TYPE_STRING
* ZFS_EV_POOL_GUID DATA_TYPE_UINT64
*
* ZFS_EV_POOL_NAME DATA_TYPE_STRING
* ZFS_EV_POOL_GUID DATA_TYPE_UINT64