diff options
| author | timh <none@none> | 2008-07-24 15:04:31 -0700 |
|---|---|---|
| committer | timh <none@none> | 2008-07-24 15:04:31 -0700 |
| commit | 0a48a24e663a04e34e2ed4e55390ad96f178dbea (patch) | |
| tree | e15d8f6acd441c1d3147bf4eac2f3bde502a25c5 /usr/src/uts/common/fs/zfs/zfs_vfsops.c | |
| parent | 9c21fe179ede0eb7881c4d5244e0ab090fdd3c9c (diff) | |
| download | illumos-gate-0a48a24e663a04e34e2ed4e55390ad96f178dbea.tar.gz | |
PSARC 2008/223 Pool root file system properties via zpool(1M)
6647661 "set once" / "create time only" properties can't be set for pool level dataset
Diffstat (limited to 'usr/src/uts/common/fs/zfs/zfs_vfsops.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_vfsops.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_vfsops.c b/usr/src/uts/common/fs/zfs/zfs_vfsops.c index 1b471c8c8a..ff12fe7be2 100644 --- a/usr/src/uts/common/fs/zfs/zfs_vfsops.c +++ b/usr/src/uts/common/fs/zfs/zfs_vfsops.c @@ -1623,7 +1623,7 @@ int zfs_get_zplprop(objset_t *os, zfs_prop_t prop, uint64_t *value) { const char *pname; - int error; + int error = ENOENT; /* * Look up the file system's value for the property. For the @@ -1634,7 +1634,8 @@ zfs_get_zplprop(objset_t *os, zfs_prop_t prop, uint64_t *value) else pname = zfs_prop_to_name(prop); - error = zap_lookup(os, MASTER_NODE_OBJ, pname, 8, 1, value); + if (os != NULL) + error = zap_lookup(os, MASTER_NODE_OBJ, pname, 8, 1, value); if (error == ENOENT) { /* No value set, use the default value */ |