summaryrefslogtreecommitdiffstats
path: root/module/zfs
diff options
context:
space:
mode:
authorJason King <[email protected]>2020-01-22 19:03:17 -0600
committerBrian Behlendorf <[email protected]>2020-01-22 17:03:17 -0800
commite2ef1cbf04c713fcdba33f8183e6a61a18f61119 (patch)
tree2b36d80a1fa639052d441758d7dc2ecb2c6e908f /module/zfs
parent79add96766f03e7382f9a4b356e7a06f66b600f8 (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')
-rw-r--r--module/zfs/dsl_prop.c12
-rw-r--r--module/zfs/zcp_synctask.c86
2 files changed, 89 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;
diff --git a/module/zfs/zcp_synctask.c b/module/zfs/zcp_synctask.c
index e089666f2..3b6015f24 100644
--- a/module/zfs/zcp_synctask.c
+++ b/module/zfs/zcp_synctask.c
@@ -15,6 +15,7 @@
/*
* Copyright (c) 2016, 2017 by Delphix. All rights reserved.
+ * Copyright 2020 Joyent, Inc.
*/
#include <sys/lua/lua.h>
@@ -35,6 +36,12 @@
#define DST_AVG_BLKSHIFT 14
+typedef struct zcp_inherit_prop_arg {
+ lua_State *zipa_state;
+ const char *zipa_prop;
+ dsl_props_set_arg_t zipa_dpsa;
+} zcp_inherit_prop_arg_t;
+
typedef int (zcp_synctask_func_t)(lua_State *, boolean_t, nvlist_t *);
typedef struct zcp_synctask_info {
const char *name;
@@ -275,6 +282,84 @@ zcp_synctask_snapshot(lua_State *state, boolean_t sync, nvlist_t *err_details)
return (err);
}
+static int zcp_synctask_inherit_prop(lua_State *, boolean_t,
+ nvlist_t *err_details);
+static zcp_synctask_info_t zcp_synctask_inherit_prop_info = {
+ .name = "inherit",
+ .func = zcp_synctask_inherit_prop,
+ .space_check = ZFS_SPACE_CHECK_RESERVED,
+ .blocks_modified = 2, /* 2 * numprops */
+ .pargs = {
+ { .za_name = "dataset", .za_lua_type = LUA_TSTRING },
+ { .za_name = "property", .za_lua_type = LUA_TSTRING },
+ { NULL, 0 }
+ },
+ .kwargs = {
+ { NULL, 0 }
+ },
+};
+
+static int
+zcp_synctask_inherit_prop_check(void *arg, dmu_tx_t *tx)
+{
+ zcp_inherit_prop_arg_t *args = arg;
+ zfs_prop_t prop = zfs_name_to_prop(args->zipa_prop);
+
+ if (prop == ZPROP_INVAL) {
+ if (zfs_prop_user(args->zipa_prop))
+ return (0);
+
+ return (EINVAL);
+ }
+
+ if (zfs_prop_readonly(prop))
+ return (EINVAL);
+
+ if (!zfs_prop_inheritable(prop))
+ return (EINVAL);
+
+ return (dsl_props_set_check(&args->zipa_dpsa, tx));
+}
+
+static void
+zcp_synctask_inherit_prop_sync(void *arg, dmu_tx_t *tx)
+{
+ zcp_inherit_prop_arg_t *args = arg;
+ dsl_props_set_arg_t *dpsa = &args->zipa_dpsa;
+
+ dsl_props_set_sync(dpsa, tx);
+}
+
+static int
+zcp_synctask_inherit_prop(lua_State *state, boolean_t sync,
+ nvlist_t *err_details)
+{
+ int err;
+ zcp_inherit_prop_arg_t zipa = { 0 };
+ dsl_props_set_arg_t *dpsa = &zipa.zipa_dpsa;
+
+ const char *dsname = lua_tostring(state, 1);
+ const char *prop = lua_tostring(state, 2);
+
+ zipa.zipa_state = state;
+ zipa.zipa_prop = prop;
+ dpsa->dpsa_dsname = dsname;
+ dpsa->dpsa_source = ZPROP_SRC_INHERITED;
+ dpsa->dpsa_props = fnvlist_alloc();
+ fnvlist_add_boolean(dpsa->dpsa_props, prop);
+
+ zcp_cleanup_handler_t *zch = zcp_register_cleanup(state,
+ (zcp_cleanup_t *)&fnvlist_free, dpsa->dpsa_props);
+
+ err = zcp_sync_task(state, zcp_synctask_inherit_prop_check,
+ zcp_synctask_inherit_prop_sync, &zipa, sync, dsname);
+
+ zcp_deregister_cleanup(state, zch);
+ fnvlist_free(dpsa->dpsa_props);
+
+ return (err);
+}
+
static int
zcp_synctask_wrapper(lua_State *state)
{
@@ -343,6 +428,7 @@ zcp_load_synctask_lib(lua_State *state, boolean_t sync)
&zcp_synctask_promote_info,
&zcp_synctask_rollback_info,
&zcp_synctask_snapshot_info,
+ &zcp_synctask_inherit_prop_info,
NULL
};