OpenZFS 7304 - zfs filesystem/snapshot counts should be read-only

Authored by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Ported-by: George Melikov <mail@gmelikov.ru>
OpenZFS-issue: https://www.illumos.org/issues/7304
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/007a6c1
Closes #5624

diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c
index 06e4854e46205c7a5f4a4e25668af5ebb1c15da8..82641b490ca88d181a581599b469289c617d504f 100644 (file)
--- a/module/zcommon/zfs_prop.c
+++ b/module/zcommon/zfs_prop.c
@@ -22,6 +22,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
+ * Copyright 2016, Joyent, Inc.
  */
 
 /* Portions Copyright 2010 Robert Milkowski */
@@ -432,6 +433,12 @@ zfs_prop_init(void)
            PROP_READONLY, ZFS_TYPE_DATASET, "<size>", "LUSED");
        zprop_register_number(ZFS_PROP_LOGICALREFERENCED, "logicalreferenced",
            0, PROP_READONLY, ZFS_TYPE_DATASET, "<size>", "LREFER");
+       zprop_register_number(ZFS_PROP_FILESYSTEM_COUNT, "filesystem_count",
+           UINT64_MAX, PROP_READONLY, ZFS_TYPE_FILESYSTEM,
+           "<count>", "FSCOUNT");
+       zprop_register_number(ZFS_PROP_SNAPSHOT_COUNT, "snapshot_count",
+           UINT64_MAX, PROP_READONLY, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
+           "<count>", "SSCOUNT");
 
        /* default number properties */
        zprop_register_number(ZFS_PROP_QUOTA, "quota", 0, PROP_DEFAULT,
@@ -452,12 +459,6 @@ zfs_prop_init(void)
        zprop_register_number(ZFS_PROP_SNAPSHOT_LIMIT, "snapshot_limit",
            UINT64_MAX, PROP_DEFAULT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
            "<count> | none", "SSLIMIT");
-       zprop_register_number(ZFS_PROP_FILESYSTEM_COUNT, "filesystem_count",
-           UINT64_MAX, PROP_DEFAULT, ZFS_TYPE_FILESYSTEM,
-           "<count>", "FSCOUNT");
-       zprop_register_number(ZFS_PROP_SNAPSHOT_COUNT, "snapshot_count",
-           UINT64_MAX, PROP_DEFAULT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
-           "<count>", "SSCOUNT");
 
        /* inherit number properties */
        zprop_register_number(ZFS_PROP_RECORDSIZE, "recordsize",