Author: delphij
Date: Tue Jul 1 21:21:56 2014
New Revision: 268122
URL: http://svnweb.freebsd.org/changeset/base/268122
Log:
4929 want prevsnap property
Reviewed by: Adam Leventhal <adam.levent...@delphix.com>
Reviewed by: Matt Amdur <matt.am...@delphix.com>
Reviewed by: Saso Kiselkov <skiselkov...@gmail.com>
Reviewed by: Boris Protopopov <bprotopo...@hotmail.com>
Reviewed by: Richard Lowe <richl...@richlowe.net>
Approved by: Dan McDonald <dan...@omniti.com>
illumos/illumos-gate@b461c7460e5e77cf65f00151162e654220c6e2fb
Modified:
vendor-sys/illumos/dist/common/zfs/zfs_prop.c
vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c
vendor-sys/illumos/dist/uts/common/sys/fs/zfs.h
Modified: vendor-sys/illumos/dist/common/zfs/zfs_prop.c
==============================================================================
--- vendor-sys/illumos/dist/common/zfs/zfs_prop.c Tue Jul 1 21:19:10
2014 (r268121)
+++ vendor-sys/illumos/dist/common/zfs/zfs_prop.c Tue Jul 1 21:21:56
2014 (r268122)
@@ -423,6 +423,8 @@ zfs_prop_init(void)
PROP_READONLY, ZFS_TYPE_DATASET, "OBJSETID");
zprop_register_hidden(ZFS_PROP_INCONSISTENT, "inconsistent",
PROP_TYPE_NUMBER, PROP_READONLY, ZFS_TYPE_DATASET, "INCONSISTENT");
+ zprop_register_hidden(ZFS_PROP_PREV_SNAP, "prevsnap", PROP_TYPE_STRING,
+ PROP_READONLY, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "PREVSNAP");
/* oddball properties */
zprop_register_impl(ZFS_PROP_CREATION, "creation", PROP_TYPE_NUMBER, 0,
Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c Tue Jul 1
21:19:10 2014 (r268121)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c Tue Jul 1
21:21:56 2014 (r268122)
@@ -20,7 +20,7 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
* Copyright (c) 2014, Joyent, Inc. All rights reserved.
* Copyright (c) 2014 RackTop Systems.
*/
@@ -1543,6 +1543,12 @@ dsl_dataset_stats(dsl_dataset_t *ds, nvl
ds->ds_phys->ds_unique_bytes);
get_clones_stat(ds, nv);
} else {
+ if (ds->ds_prev != NULL && ds->ds_prev != dp->dp_origin_snap) {
+ char buf[MAXNAMELEN];
+ dsl_dataset_name(ds->ds_prev, buf);
+ dsl_prop_nvlist_add_string(nv, ZFS_PROP_PREV_SNAP, buf);
+ }
+
dsl_dir_stats(ds->ds_dir, nv);
}
Modified: vendor-sys/illumos/dist/uts/common/sys/fs/zfs.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/sys/fs/zfs.h Tue Jul 1 21:19:10
2014 (r268121)
+++ vendor-sys/illumos/dist/uts/common/sys/fs/zfs.h Tue Jul 1 21:21:56
2014 (r268122)
@@ -147,6 +147,7 @@ typedef enum {
ZFS_PROP_FILESYSTEM_COUNT,
ZFS_PROP_SNAPSHOT_COUNT,
ZFS_PROP_REDUNDANT_METADATA,
+ ZFS_PROP_PREV_SNAP,
ZFS_NUM_PROPS
} zfs_prop_t;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
