From 1715493f38b0732b4bb23077d680e3a325a9096e Mon Sep 17 00:00:00 2001 From: Matthew Ahrens Date: Fri, 1 Jan 2016 14:15:31 +0100 Subject: Illumos 4929 - want prevsnap property 4929 want prevsnap property Reviewed by: Adam Leventhal Reviewed by: Matt Amdur Reviewed by: Saso Kiselkov Reviewed by: Boris Protopopov Reviewed by: Richard Lowe Approved by: Dan McDonald References: https://www.illumos.org/issues/4929 https://github.com/illumos/illumos-gate/commit/b461c74 Porting notes: - [include/sys/fs/zfs.h] - f67d70 Create an 'overlay' property - 11b9ec Add full SELinux support - [fs/zfs/dsl_dataset.c] - This increases the stack size of dsl_dataset_stats() but nothing has been changed until this is shown to be an issue. Ported-by: kernelOfTruth kerneloftruth@gmail.com Signed-off-by: Brian Behlendorf --- module/zfs/dsl_dataset.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'module/zfs') diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c index edc5ea17a..9c017124a 100644 --- a/module/zfs/dsl_dataset.c +++ b/module/zfs/dsl_dataset.c @@ -1695,6 +1695,12 @@ dsl_dataset_stats(dsl_dataset_t *ds, nvlist_t *nv) dsl_dataset_phys(ds)->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); } -- cgit v1.2.3