diff options
| author | delphij <delphij@FreeBSD.org> | 2013-07-30 21:02:09 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2013-07-30 21:02:09 +0000 |
| commit | c5affee6a3a59d69c44d3493fa98bec9080bb11f (patch) | |
| tree | 23a5763925ca6f88812017c8afbc82918ed35156 /sys/cddl/contrib/opensolaris/common | |
| parent | ef92cf9910e5912fe431aaad8b444da2aaae9741 (diff) | |
| download | FreeBSD-src-c5affee6a3a59d69c44d3493fa98bec9080bb11f.zip FreeBSD-src-c5affee6a3a59d69c44d3493fa98bec9080bb11f.tar.gz | |
MFV r253781 + r253871:
Illumos ZFS issues:
3894 zfs should not allow snapshot of inconsistent dataset
MFC after: 2 weeks
Diffstat (limited to 'sys/cddl/contrib/opensolaris/common')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c b/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c index 4243c20..4bdc946 100644 --- a/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c +++ b/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c @@ -395,6 +395,8 @@ zfs_prop_init(void) PROP_READONLY, ZFS_TYPE_DATASET, "UNIQUE"); zprop_register_hidden(ZFS_PROP_OBJSETID, "objsetid", PROP_TYPE_NUMBER, PROP_READONLY, ZFS_TYPE_DATASET, "OBJSETID"); + zprop_register_hidden(ZFS_PROP_INCONSISTENT, "inconsistent", + PROP_TYPE_NUMBER, PROP_READONLY, ZFS_TYPE_DATASET, "INCONSISTENT"); /* oddball properties */ zprop_register_impl(ZFS_PROP_CREATION, "creation", PROP_TYPE_NUMBER, 0, |
