diff options
| author | Andriy Gapon <[email protected]> | 2017-04-13 14:32:08 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-04-14 11:11:28 -0700 |
| commit | 87a275d97aa5b7bb47c0601c8b005e8ae85be2f7 (patch) | |
| tree | 621cae83827b13a3264f80b8e95e914278f5da1f /module/zfs/zfs_vfsops.c | |
| parent | 31b6bc74b91ba659689dab1d316d72af27625e4d (diff) | |
OpenZFS 6101 - attempt to lzc_create() a filesystem under a volume results in a panic
Authored by: Andriy Gapon <[email protected]>
Approved by: Dan McDonald <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Ported-by: Giuseppe Di Natale <[email protected]>
When querying ZPL properties verify that the objset is of type
DMU_OST_ZFS.
OpenZFS-issue: https://www.illumos.org/issues/6101
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/ce2243a
Closes #6015
Diffstat (limited to 'module/zfs/zfs_vfsops.c')
| -rw-r--r-- | module/zfs/zfs_vfsops.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c index 0b8214e0f..40fd5f764 100644 --- a/module/zfs/zfs_vfsops.c +++ b/module/zfs/zfs_vfsops.c @@ -2058,8 +2058,10 @@ zfs_get_zplprop(objset_t *os, zfs_prop_t prop, uint64_t *value) else pname = zfs_prop_to_name(prop); - if (os != NULL) + if (os != NULL) { + ASSERT3U(os->os_phys->os_type, ==, DMU_OST_ZFS); error = zap_lookup(os, MASTER_NODE_OBJ, pname, 8, 1, value); + } if (error == ENOENT) { /* No value set, use the default value */ |