diff options
| author | George Melikov <[email protected]> | 2017-01-23 20:49:57 +0300 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-01-23 09:49:57 -0800 |
| commit | e67a7ffb5d1f4255a89d7511ea3554c7c7488e5a (patch) | |
| tree | 36ed7e0bba5131d3de4ca06968d75d44afad08e8 | |
| parent | f85c06bedfd2a60f5b5d6a7492ed847c2bffd9fe (diff) | |
OpenZFS 6052 - decouple lzc_create() from the implementation details
Authored by: Andriy Gapon <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Approved by: Richard Lowe <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Ported-by: George Melikov [email protected]
OpenZFS-issue: https://www.illumos.org/issues/6052
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/26455f9
Closes #5622
| -rw-r--r-- | include/libzfs_core.h | 10 | ||||
| -rw-r--r-- | include/sys/fs/zfs.h | 4 | ||||
| -rw-r--r-- | lib/libzfs/libzfs_dataset.c | 6 | ||||
| -rw-r--r-- | lib/libzfs_core/libzfs_core.c | 4 |
4 files changed, 18 insertions, 6 deletions
diff --git a/include/libzfs_core.h b/include/libzfs_core.h index bc0f115bb..e67e4a130 100644 --- a/include/libzfs_core.h +++ b/include/libzfs_core.h @@ -38,8 +38,16 @@ extern "C" { int libzfs_core_init(void); void libzfs_core_fini(void); +/* + * NB: this type should be kept binary compatible with dmu_objset_type_t. + */ +enum lzc_dataset_type { + LZC_DATSET_TYPE_ZFS = 2, + LZC_DATSET_TYPE_ZVOL +}; + int lzc_snapshot(nvlist_t *, nvlist_t *, nvlist_t **); -int lzc_create(const char *, dmu_objset_type_t, nvlist_t *); +int lzc_create(const char *, enum lzc_dataset_type, nvlist_t *); int lzc_clone(const char *, const char *, nvlist_t *); int lzc_destroy_snaps(nvlist_t *, boolean_t, nvlist_t **); int lzc_bookmark(nvlist_t *, nvlist_t **); diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h index f09e4bfa0..e95e8ce68 100644 --- a/include/sys/fs/zfs.h +++ b/include/sys/fs/zfs.h @@ -54,6 +54,10 @@ typedef enum { ZFS_TYPE_BOOKMARK = (1 << 4) } zfs_type_t; +/* + * NB: lzc_dataset_type should be updated whenever a new objset type is added, + * if it represents a real type of a dataset that can be created from userland. + */ typedef enum dmu_objset_type { DMU_OST_NONE, DMU_OST_META, diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c index 72d86590e..d4f016660 100644 --- a/lib/libzfs/libzfs_dataset.c +++ b/lib/libzfs/libzfs_dataset.c @@ -3224,7 +3224,7 @@ zfs_create(libzfs_handle_t *hdl, const char *path, zfs_type_t type, uint64_t blocksize = zfs_prop_default_numeric(ZFS_PROP_VOLBLOCKSIZE); char errbuf[1024]; uint64_t zoned; - dmu_objset_type_t ost; + enum lzc_dataset_type ost; (void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN, "cannot create '%s'"), path); @@ -3251,9 +3251,9 @@ zfs_create(libzfs_handle_t *hdl, const char *path, zfs_type_t type, } if (type == ZFS_TYPE_VOLUME) - ost = DMU_OST_ZVOL; + ost = LZC_DATSET_TYPE_ZVOL; else - ost = DMU_OST_ZFS; + ost = LZC_DATSET_TYPE_ZFS; /* open zpool handle for prop validation */ char pool_path[ZFS_MAX_DATASET_NAME_LEN]; diff --git a/lib/libzfs_core/libzfs_core.c b/lib/libzfs_core/libzfs_core.c index 3110d8903..5924f6762 100644 --- a/lib/libzfs_core/libzfs_core.c +++ b/lib/libzfs_core/libzfs_core.c @@ -170,11 +170,11 @@ out: } int -lzc_create(const char *fsname, dmu_objset_type_t type, nvlist_t *props) +lzc_create(const char *fsname, enum lzc_dataset_type type, nvlist_t *props) { int error; nvlist_t *args = fnvlist_alloc(); - fnvlist_add_int32(args, "type", type); + fnvlist_add_int32(args, "type", (dmu_objset_type_t)type); if (props != NULL) fnvlist_add_nvlist(args, "props", props); error = lzc_ioctl(ZFS_IOC_CREATE, fsname, args, NULL); |