diff options
| author | Jason King <[email protected]> | 2020-01-22 19:03:17 -0600 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-01-22 17:03:17 -0800 |
| commit | e2ef1cbf04c713fcdba33f8183e6a61a18f61119 (patch) | |
| tree | 2b36d80a1fa639052d441758d7dc2ecb2c6e908f /module/zfs/dsl_prop.c | |
| parent | 79add96766f03e7382f9a4b356e7a06f66b600f8 (diff) | |
Support inheriting properties in channel programs
This adds support in channel programs to inherit properties analogous
to `zfs inherit` by adding `zfs.sync.inherit` and `zfs.check.inherit`
functions to the ZFS LUA API.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Jason King <[email protected]>
Closes #9738
Diffstat (limited to 'module/zfs/dsl_prop.c')
| -rw-r--r-- | module/zfs/dsl_prop.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/module/zfs/dsl_prop.c b/module/zfs/dsl_prop.c index 4c468de5f..1c99f3b75 100644 --- a/module/zfs/dsl_prop.c +++ b/module/zfs/dsl_prop.c @@ -22,7 +22,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2015 by Delphix. All rights reserved. * Copyright (c) 2013 Martin Matuska. All rights reserved. - * Copyright 2015, Joyent, Inc. + * Copyright 2019 Joyent, Inc. */ #include <sys/zfs_context.h> @@ -856,13 +856,7 @@ dsl_prop_inherit(const char *dsname, const char *propname, return (error); } -typedef struct dsl_props_set_arg { - const char *dpsa_dsname; - zprop_source_t dpsa_source; - nvlist_t *dpsa_props; -} dsl_props_set_arg_t; - -static int +int dsl_props_set_check(void *arg, dmu_tx_t *tx) { dsl_props_set_arg_t *dpsa = arg; @@ -940,7 +934,7 @@ dsl_props_set_sync_impl(dsl_dataset_t *ds, zprop_source_t source, } } -static void +void dsl_props_set_sync(void *arg, dmu_tx_t *tx) { dsl_props_set_arg_t *dpsa = arg; |