diff options
author | mm <mm@FreeBSD.org> | 2013-02-26 08:53:33 +0000 |
---|---|---|
committer | mm <mm@FreeBSD.org> | 2013-02-26 08:53:33 +0000 |
commit | 7fd8f89eb9b49ef334451ff59d66dcdf139dd4cb (patch) | |
tree | 5e33d3eb15d6a74d78059b6541fe4dd9a254f731 | |
parent | 5b41fbc0be411a475db185016e80731e433c0e9b (diff) | |
download | FreeBSD-src-7fd8f89eb9b49ef334451ff59d66dcdf139dd4cb.zip FreeBSD-src-7fd8f89eb9b49ef334451ff59d66dcdf139dd4cb.tar.gz |
Update vendor/illumos/dist and vendor-sys/illumos/dist
to illumos-gate 13969:b2c7608044b7
Illumos ZFS issues:
3588 provide zfs properties for logical (uncompressed) space used and
referenced
-rw-r--r-- | common/zfs/zfs_prop.c | 6 | ||||
-rw-r--r-- | uts/common/fs/zfs/dsl_dataset.c | 2 | ||||
-rw-r--r-- | uts/common/fs/zfs/dsl_dir.c | 2 | ||||
-rw-r--r-- | uts/common/sys/fs/zfs.h | 2 |
4 files changed, 11 insertions, 1 deletions
diff --git a/common/zfs/zfs_prop.c b/common/zfs/zfs_prop.c index 9d83655..ebb2679 100644 --- a/common/zfs/zfs_prop.c +++ b/common/zfs/zfs_prop.c @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2012 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. */ @@ -350,6 +350,10 @@ zfs_prop_init(void) ZFS_TYPE_SNAPSHOT, "<count>", "USERREFS"); zprop_register_number(ZFS_PROP_WRITTEN, "written", 0, PROP_READONLY, ZFS_TYPE_DATASET, "<size>", "WRITTEN"); + zprop_register_number(ZFS_PROP_LOGICALUSED, "logicalused", 0, + PROP_READONLY, ZFS_TYPE_DATASET, "<size>", "LUSED"); + zprop_register_number(ZFS_PROP_LOGICALREFERENCED, "logicalreferenced", + 0, PROP_READONLY, ZFS_TYPE_DATASET, "<size>", "LREFER"); /* default number properties */ zprop_register_number(ZFS_PROP_QUOTA, "quota", 0, PROP_DEFAULT, diff --git a/uts/common/fs/zfs/dsl_dataset.c b/uts/common/fs/zfs/dsl_dataset.c index cf888d2..0a5ef83 100644 --- a/uts/common/fs/zfs/dsl_dataset.c +++ b/uts/common/fs/zfs/dsl_dataset.c @@ -2247,6 +2247,8 @@ dsl_dataset_stats(dsl_dataset_t *ds, nvlist_t *nv) ds->ds_phys->ds_compressed_bytes); dsl_prop_nvlist_add_uint64(nv, ZFS_PROP_REFRATIO, ratio); + dsl_prop_nvlist_add_uint64(nv, ZFS_PROP_LOGICALREFERENCED, + ds->ds_phys->ds_uncompressed_bytes); if (dsl_dataset_is_snapshot(ds)) { dsl_prop_nvlist_add_uint64(nv, ZFS_PROP_COMPRESSRATIO, ratio); diff --git a/uts/common/fs/zfs/dsl_dir.c b/uts/common/fs/zfs/dsl_dir.c index df3f02b..5ccb686 100644 --- a/uts/common/fs/zfs/dsl_dir.c +++ b/uts/common/fs/zfs/dsl_dir.c @@ -530,6 +530,8 @@ dsl_dir_stats(dsl_dir_t *dd, nvlist_t *nv) dd->dd_phys->dd_compressed_bytes == 0 ? 100 : (dd->dd_phys->dd_uncompressed_bytes * 100 / dd->dd_phys->dd_compressed_bytes)); + dsl_prop_nvlist_add_uint64(nv, ZFS_PROP_LOGICALUSED, + dd->dd_phys->dd_uncompressed_bytes); if (dd->dd_phys->dd_flags & DD_FLAG_USED_BREAKDOWN) { dsl_prop_nvlist_add_uint64(nv, ZFS_PROP_USEDSNAP, dd->dd_phys->dd_used_breakdown[DD_USED_SNAP]); diff --git a/uts/common/sys/fs/zfs.h b/uts/common/sys/fs/zfs.h index 8639a2b..286b35b 100644 --- a/uts/common/sys/fs/zfs.h +++ b/uts/common/sys/fs/zfs.h @@ -138,6 +138,8 @@ typedef enum { ZFS_PROP_REFRATIO, ZFS_PROP_WRITTEN, ZFS_PROP_CLONES, + ZFS_PROP_LOGICALUSED, + ZFS_PROP_LOGICALREFERENCED, ZFS_NUM_PROPS } zfs_prop_t; |