mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 18:40:43 +03:00
Illumos 4368, 4369.
4369 implement zfs bookmarks 4368 zfs send filesystems from readonly pools Reviewed by: Christopher Siden <christopher.siden@delphix.com> Reviewed by: George Wilson <george.wilson@delphix.com> Approved by: Garrett D'Amore <garrett@damore.org> References: https://www.illumos.org/issues/4369 https://www.illumos.org/issues/4368 https://github.com/illumos/illumos-gate/commit/78f1710 Ported by: Tim Chase <tim@chase2k.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #2530
This commit is contained in:
committed by
Brian Behlendorf
parent
b0bc7a84d9
commit
da536844d5
@@ -46,10 +46,11 @@ extern "C" {
|
||||
* combined into masks that can be passed to various functions.
|
||||
*/
|
||||
typedef enum {
|
||||
ZFS_TYPE_FILESYSTEM = 0x1,
|
||||
ZFS_TYPE_SNAPSHOT = 0x2,
|
||||
ZFS_TYPE_VOLUME = 0x4,
|
||||
ZFS_TYPE_POOL = 0x8
|
||||
ZFS_TYPE_FILESYSTEM = (1 << 0),
|
||||
ZFS_TYPE_SNAPSHOT = (1 << 1),
|
||||
ZFS_TYPE_VOLUME = (1 << 2),
|
||||
ZFS_TYPE_POOL = (1 << 3),
|
||||
ZFS_TYPE_BOOKMARK = (1 << 4)
|
||||
} zfs_type_t;
|
||||
|
||||
typedef enum dmu_objset_type {
|
||||
@@ -786,7 +787,7 @@ typedef struct ddt_histogram {
|
||||
*/
|
||||
typedef enum zfs_ioc {
|
||||
/*
|
||||
* Illumos - 69/128 numbers reserved.
|
||||
* Illumos - 70/128 numbers reserved.
|
||||
*/
|
||||
ZFS_IOC_FIRST = ('Z' << 8),
|
||||
ZFS_IOC = ZFS_IOC_FIRST,
|
||||
@@ -857,6 +858,9 @@ typedef enum zfs_ioc {
|
||||
ZFS_IOC_SEND_NEW,
|
||||
ZFS_IOC_SEND_SPACE,
|
||||
ZFS_IOC_CLONE,
|
||||
ZFS_IOC_BOOKMARK,
|
||||
ZFS_IOC_GET_BOOKMARKS,
|
||||
ZFS_IOC_DESTROY_BOOKMARKS,
|
||||
|
||||
/*
|
||||
* Linux - 3/64 numbers reserved.
|
||||
|
||||
Reference in New Issue
Block a user