diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-08-25 22:57:16 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-08-25 22:58:56 +0000 |
| commit | 08aba0aec7b7f676ccc3f7886f59f277d668d5b4 (patch) | |
| tree | 98cd87023a4ea28dc9a72fc6a810e02997cd4b6f /sys/contrib/openzfs/module/zcommon | |
| parent | 7ccdad905f30e90606e11104d46e39c9a6405279 (diff) | |
| parent | a582d52993134905f2e96cebe7aff410f29b1ad8 (diff) | |
| download | src-08aba0aec7b7f676ccc3f7886f59f277d668d5b4.tar.gz src-08aba0aec7b7f676ccc3f7886f59f277d668d5b4.zip | |
zfs: merge openzfs/zfs@a582d5299
Notable upstream pull request merges:
#13717 Fix zpool status in case of unloaded keys
#13753 Prevent zevent list from consuming all of kernel memory
#13767 arcstat: fix -p option
#13785 Updates for snapshots_changed property
Obtained from: OpenZFS
OpenZFS commit: a582d52993134905f2e96cebe7aff410f29b1ad8
Diffstat (limited to 'sys/contrib/openzfs/module/zcommon')
| -rw-r--r-- | sys/contrib/openzfs/module/zcommon/zfs_prop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/module/zcommon/zfs_prop.c b/sys/contrib/openzfs/module/zcommon/zfs_prop.c index 2a58088a78e6..0e91304ecd4b 100644 --- a/sys/contrib/openzfs/module/zcommon/zfs_prop.c +++ b/sys/contrib/openzfs/module/zcommon/zfs_prop.c @@ -465,7 +465,7 @@ zfs_prop_init(void) /* inherit index (boolean) properties */ zprop_register_index(ZFS_PROP_ATIME, "atime", 1, PROP_INHERIT, ZFS_TYPE_FILESYSTEM, "on | off", "ATIME", boolean_table, sfeatures); - zprop_register_index(ZFS_PROP_RELATIME, "relatime", 0, PROP_INHERIT, + zprop_register_index(ZFS_PROP_RELATIME, "relatime", 1, PROP_INHERIT, ZFS_TYPE_FILESYSTEM, "on | off", "RELATIME", boolean_table, sfeatures); zprop_register_index(ZFS_PROP_DEVICES, "devices", 1, PROP_INHERIT, |