mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-25 11:47:43 +03:00
module: mark arguments used
Reviewed-by: Alejandro Colomar <alx.manpages@gmail.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes #13110
This commit is contained in:
+48
-59
@@ -373,10 +373,10 @@ zfs_log_history(zfs_cmd_t *zc)
|
||||
* Policy for top-level read operations (list pools). Requires no privileges,
|
||||
* and can be used in the local zone, as there is no associated dataset.
|
||||
*/
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_none(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) zc, (void) innvl, (void) cr;
|
||||
return (0);
|
||||
}
|
||||
|
||||
@@ -384,10 +384,10 @@ zfs_secpolicy_none(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
* Policy for dataset read operations (list children, get statistics). Requires
|
||||
* no privileges, but must be visible in the local zone.
|
||||
*/
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_read(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) innvl, (void) cr;
|
||||
if (INGLOBALZONE(curproc) ||
|
||||
zone_dataset_visible(zc->zc_name, NULL))
|
||||
return (0);
|
||||
@@ -656,35 +656,29 @@ zfs_secpolicy_setprop(const char *dsname, zfs_prop_t prop, nvpair_t *propval,
|
||||
return (zfs_secpolicy_write_perms(dsname, zfs_prop_to_name(prop), cr));
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_set_fsacl(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
int error;
|
||||
|
||||
error = zfs_dozonecheck(zc->zc_name, cr);
|
||||
if (error != 0)
|
||||
return (error);
|
||||
|
||||
/*
|
||||
* permission to set permissions will be evaluated later in
|
||||
* dsl_deleg_can_allow()
|
||||
*/
|
||||
return (0);
|
||||
(void) innvl;
|
||||
return (zfs_dozonecheck(zc->zc_name, cr));
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_rollback(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) innvl;
|
||||
return (zfs_secpolicy_write_perms(zc->zc_name,
|
||||
ZFS_DELEG_PERM_ROLLBACK, cr));
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_send(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) innvl;
|
||||
dsl_pool_t *dp;
|
||||
dsl_dataset_t *ds;
|
||||
const char *cp;
|
||||
@@ -717,10 +711,10 @@ zfs_secpolicy_send(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
return (error);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_send_new(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) innvl;
|
||||
return (zfs_secpolicy_write_perms(zc->zc_name,
|
||||
ZFS_DELEG_PERM_SEND, cr));
|
||||
}
|
||||
@@ -728,12 +722,14 @@ zfs_secpolicy_send_new(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
static int
|
||||
zfs_secpolicy_share(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) zc, (void) innvl, (void) cr;
|
||||
return (SET_ERROR(ENOTSUP));
|
||||
}
|
||||
|
||||
static int
|
||||
zfs_secpolicy_smb_acl(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) zc, (void) innvl, (void) cr;
|
||||
return (SET_ERROR(ENOTSUP));
|
||||
}
|
||||
|
||||
@@ -771,10 +767,10 @@ zfs_secpolicy_destroy_perms(const char *name, cred_t *cr)
|
||||
return (zfs_secpolicy_write_perms(name, ZFS_DELEG_PERM_DESTROY, cr));
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_destroy(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) innvl;
|
||||
return (zfs_secpolicy_destroy_perms(zc->zc_name, cr));
|
||||
}
|
||||
|
||||
@@ -782,10 +778,10 @@ zfs_secpolicy_destroy(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
* Destroying snapshots with delegated permissions requires
|
||||
* descendant mount and destroy permissions.
|
||||
*/
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_destroy_snaps(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) zc;
|
||||
nvlist_t *snaps;
|
||||
nvpair_t *pair, *nextpair;
|
||||
int error = 0;
|
||||
@@ -844,17 +840,17 @@ zfs_secpolicy_rename_perms(const char *from, const char *to, cred_t *cr)
|
||||
return (error);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_rename(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) innvl;
|
||||
return (zfs_secpolicy_rename_perms(zc->zc_name, zc->zc_value, cr));
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_promote(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) innvl;
|
||||
dsl_pool_t *dp;
|
||||
dsl_dataset_t *clone;
|
||||
int error;
|
||||
@@ -899,10 +895,10 @@ zfs_secpolicy_promote(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
return (error);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_recv(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) innvl;
|
||||
int error;
|
||||
|
||||
if ((error = zfs_secpolicy_write_perms(zc->zc_name,
|
||||
@@ -917,13 +913,6 @@ zfs_secpolicy_recv(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
ZFS_DELEG_PERM_CREATE, cr));
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_recv_new(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
return (zfs_secpolicy_recv(zc, innvl, cr));
|
||||
}
|
||||
|
||||
int
|
||||
zfs_secpolicy_snapshot_perms(const char *name, cred_t *cr)
|
||||
{
|
||||
@@ -934,10 +923,10 @@ zfs_secpolicy_snapshot_perms(const char *name, cred_t *cr)
|
||||
/*
|
||||
* Check for permission to create each snapshot in the nvlist.
|
||||
*/
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_snapshot(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) zc;
|
||||
nvlist_t *snaps;
|
||||
int error = 0;
|
||||
nvpair_t *pair;
|
||||
@@ -965,10 +954,10 @@ zfs_secpolicy_snapshot(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
/*
|
||||
* Check for permission to create each bookmark in the nvlist.
|
||||
*/
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_bookmark(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) zc;
|
||||
int error = 0;
|
||||
|
||||
for (nvpair_t *pair = nvlist_next_nvpair(innvl, NULL);
|
||||
@@ -990,10 +979,10 @@ zfs_secpolicy_bookmark(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
return (error);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_destroy_bookmarks(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) zc;
|
||||
nvpair_t *pair, *nextpair;
|
||||
int error = 0;
|
||||
|
||||
@@ -1031,10 +1020,10 @@ zfs_secpolicy_destroy_bookmarks(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
return (error);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_log_history(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) zc, (void) innvl, (void) cr;
|
||||
/*
|
||||
* Even root must have a proper TSD so that we know what pool
|
||||
* to log to.
|
||||
@@ -1072,10 +1061,11 @@ zfs_secpolicy_create_clone(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
* Policy for pool operations - create/destroy pools, add vdevs, etc. Requires
|
||||
* SYS_CONFIG privilege, which is not available in a local zone.
|
||||
*/
|
||||
/* ARGSUSED */
|
||||
int
|
||||
zfs_secpolicy_config(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) zc, (void) innvl;
|
||||
|
||||
if (secpolicy_sys_config(cr, B_FALSE) != 0)
|
||||
return (SET_ERROR(EPERM));
|
||||
|
||||
@@ -1085,10 +1075,10 @@ zfs_secpolicy_config(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
/*
|
||||
* Policy for object to name lookups.
|
||||
*/
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_diff(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) innvl;
|
||||
int error;
|
||||
|
||||
if ((error = secpolicy_sys_config(cr, B_FALSE)) == 0)
|
||||
@@ -1101,17 +1091,17 @@ zfs_secpolicy_diff(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
/*
|
||||
* Policy for fault injection. Requires all privileges.
|
||||
*/
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_inject(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) zc, (void) innvl;
|
||||
return (secpolicy_zinject(cr));
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_inherit_prop(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) innvl;
|
||||
zfs_prop_t prop = zfs_name_to_prop(zc->zc_value);
|
||||
|
||||
if (prop == ZPROP_INVAL) {
|
||||
@@ -1174,18 +1164,18 @@ zfs_secpolicy_userspace_many(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
userquota_perms[zc->zc_objset_type], cr));
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_userspace_upgrade(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) innvl;
|
||||
return (zfs_secpolicy_setprop(zc->zc_name, ZFS_PROP_VERSION,
|
||||
NULL, cr));
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_hold(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) zc;
|
||||
nvpair_t *pair;
|
||||
nvlist_t *holds;
|
||||
int error;
|
||||
@@ -1206,10 +1196,10 @@ zfs_secpolicy_hold(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_secpolicy_release(zfs_cmd_t *zc, nvlist_t *innvl, cred_t *cr)
|
||||
{
|
||||
(void) zc;
|
||||
nvpair_t *pair;
|
||||
int error;
|
||||
|
||||
@@ -3149,7 +3139,6 @@ zfs_ioc_get_fsacl(zfs_cmd_t *zc)
|
||||
return (error);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static void
|
||||
zfs_create_cb(objset_t *os, void *arg, cred_t *cr, dmu_tx_t *tx)
|
||||
{
|
||||
@@ -3511,11 +3500,11 @@ static const zfs_ioc_key_t zfs_keys_remap[] = {
|
||||
/* no nvl keys */
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_remap(const char *fsname, nvlist_t *innvl, nvlist_t *outnvl)
|
||||
{
|
||||
/* This IOCTL is no longer supported. */
|
||||
(void) fsname, (void) innvl, (void) outnvl;
|
||||
return (0);
|
||||
}
|
||||
|
||||
@@ -3603,10 +3592,10 @@ static const zfs_ioc_key_t zfs_keys_log_history[] = {
|
||||
{"message", DATA_TYPE_STRING, 0},
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_log_history(const char *unused, nvlist_t *innvl, nvlist_t *outnvl)
|
||||
{
|
||||
(void) unused, (void) outnvl;
|
||||
const char *message;
|
||||
char *poolname;
|
||||
spa_t *spa;
|
||||
@@ -3709,10 +3698,10 @@ zfs_unmount_snap(const char *snapname)
|
||||
(void) zfsctl_snapshot_unmount(snapname, MNT_FORCE);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_unmount_snap_cb(const char *snapname, void *arg)
|
||||
{
|
||||
(void) arg;
|
||||
zfs_unmount_snap(snapname);
|
||||
return (0);
|
||||
}
|
||||
@@ -3756,7 +3745,6 @@ static const zfs_ioc_key_t zfs_keys_destroy_snaps[] = {
|
||||
{"defer", DATA_TYPE_BOOLEAN, ZK_OPTIONAL},
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_destroy_snaps(const char *poolname, nvlist_t *innvl, nvlist_t *outnvl)
|
||||
{
|
||||
@@ -3809,10 +3797,10 @@ static const zfs_ioc_key_t zfs_keys_bookmark[] = {
|
||||
{"<bookmark>...", DATA_TYPE_STRING, ZK_WILDCARDLIST},
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_bookmark(const char *poolname, nvlist_t *innvl, nvlist_t *outnvl)
|
||||
{
|
||||
(void) poolname;
|
||||
return (dsl_bookmark_create(innvl, outnvl));
|
||||
}
|
||||
|
||||
@@ -3849,11 +3837,11 @@ static const zfs_ioc_key_t zfs_keys_get_bookmark_props[] = {
|
||||
/* no nvl keys */
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_get_bookmark_props(const char *bookmark, nvlist_t *innvl,
|
||||
nvlist_t *outnvl)
|
||||
{
|
||||
(void) innvl;
|
||||
char fsname[ZFS_MAX_DATASET_NAME_LEN];
|
||||
char *bmname;
|
||||
|
||||
@@ -3958,10 +3946,10 @@ static const zfs_ioc_key_t zfs_keys_pool_checkpoint[] = {
|
||||
/* no nvl keys */
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_pool_checkpoint(const char *poolname, nvlist_t *innvl, nvlist_t *outnvl)
|
||||
{
|
||||
(void) innvl, (void) outnvl;
|
||||
return (spa_checkpoint(poolname));
|
||||
}
|
||||
|
||||
@@ -3973,11 +3961,11 @@ static const zfs_ioc_key_t zfs_keys_pool_discard_checkpoint[] = {
|
||||
/* no nvl keys */
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_pool_discard_checkpoint(const char *poolname, nvlist_t *innvl,
|
||||
nvlist_t *outnvl)
|
||||
{
|
||||
(void) innvl, (void) outnvl;
|
||||
return (spa_checkpoint_discard(poolname));
|
||||
}
|
||||
|
||||
@@ -4339,7 +4327,6 @@ static const zfs_ioc_key_t zfs_keys_rollback[] = {
|
||||
{"target", DATA_TYPE_STRING, ZK_OPTIONAL},
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_rollback(const char *fsname, nvlist_t *innvl, nvlist_t *outnvl)
|
||||
{
|
||||
@@ -4411,14 +4398,15 @@ recursive_unmount(const char *fsname, void *arg)
|
||||
* outnvl is unused
|
||||
*/
|
||||
|
||||
/* ARGSUSED */
|
||||
static const zfs_ioc_key_t zfs_keys_redact[] = {
|
||||
{"bookname", DATA_TYPE_STRING, 0},
|
||||
{"snapnv", DATA_TYPE_NVLIST, 0},
|
||||
};
|
||||
|
||||
static int
|
||||
zfs_ioc_redact(const char *snapname, nvlist_t *innvl, nvlist_t *outnvl)
|
||||
{
|
||||
(void) outnvl;
|
||||
nvlist_t *redactnvl = NULL;
|
||||
char *redactbook = NULL;
|
||||
|
||||
@@ -5800,10 +5788,10 @@ static const zfs_ioc_key_t zfs_keys_pool_reopen[] = {
|
||||
{"scrub_restart", DATA_TYPE_BOOLEAN_VALUE, ZK_OPTIONAL},
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_pool_reopen(const char *pool, nvlist_t *innvl, nvlist_t *outnvl)
|
||||
{
|
||||
(void) outnvl;
|
||||
spa_t *spa;
|
||||
int error;
|
||||
boolean_t rc, scrub_restart = B_TRUE;
|
||||
@@ -6210,10 +6198,10 @@ static const zfs_ioc_key_t zfs_keys_hold[] = {
|
||||
{"cleanup_fd", DATA_TYPE_INT32, ZK_OPTIONAL},
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_hold(const char *pool, nvlist_t *args, nvlist_t *errlist)
|
||||
{
|
||||
(void) pool;
|
||||
nvpair_t *pair;
|
||||
nvlist_t *holds;
|
||||
int cleanup_fd = -1;
|
||||
@@ -6262,10 +6250,10 @@ static const zfs_ioc_key_t zfs_keys_get_holds[] = {
|
||||
/* no nvl keys */
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_get_holds(const char *snapname, nvlist_t *args, nvlist_t *outnvl)
|
||||
{
|
||||
(void) args;
|
||||
return (dsl_dataset_get_holds(snapname, outnvl));
|
||||
}
|
||||
|
||||
@@ -6284,10 +6272,10 @@ static const zfs_ioc_key_t zfs_keys_release[] = {
|
||||
{"<snapname>...", DATA_TYPE_NVLIST, ZK_WILDCARDLIST},
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_release(const char *pool, nvlist_t *holds, nvlist_t *errlist)
|
||||
{
|
||||
(void) pool;
|
||||
return (dsl_dataset_user_release(holds, errlist));
|
||||
}
|
||||
|
||||
@@ -6521,10 +6509,10 @@ static const zfs_ioc_key_t zfs_keys_send_new[] = {
|
||||
{"redactbook", DATA_TYPE_STRING, ZK_OPTIONAL},
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_send_new(const char *snapname, nvlist_t *innvl, nvlist_t *outnvl)
|
||||
{
|
||||
(void) outnvl;
|
||||
int error;
|
||||
offset_t off;
|
||||
char *fromname = NULL;
|
||||
@@ -6571,11 +6559,12 @@ zfs_ioc_send_new(const char *snapname, nvlist_t *innvl, nvlist_t *outnvl)
|
||||
return (error);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
send_space_sum(objset_t *os, void *buf, int len, void *arg)
|
||||
{
|
||||
(void) os, (void) buf;
|
||||
uint64_t *size = arg;
|
||||
|
||||
*size += len;
|
||||
return (0);
|
||||
}
|
||||
@@ -6767,10 +6756,10 @@ static const zfs_ioc_key_t zfs_keys_pool_sync[] = {
|
||||
{"force", DATA_TYPE_BOOLEAN_VALUE, 0},
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_pool_sync(const char *pool, nvlist_t *innvl, nvlist_t *onvl)
|
||||
{
|
||||
(void) onvl;
|
||||
int err;
|
||||
boolean_t rc, force = B_FALSE;
|
||||
spa_t *spa;
|
||||
@@ -6810,10 +6799,10 @@ static const zfs_ioc_key_t zfs_keys_load_key[] = {
|
||||
{"noop", DATA_TYPE_BOOLEAN, ZK_OPTIONAL},
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_load_key(const char *dsname, nvlist_t *innvl, nvlist_t *outnvl)
|
||||
{
|
||||
(void) outnvl;
|
||||
int ret;
|
||||
dsl_crypto_params_t *dcp = NULL;
|
||||
nvlist_t *hidden_args;
|
||||
@@ -6852,10 +6841,10 @@ static const zfs_ioc_key_t zfs_keys_unload_key[] = {
|
||||
/* no nvl keys */
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_unload_key(const char *dsname, nvlist_t *innvl, nvlist_t *outnvl)
|
||||
{
|
||||
(void) innvl, (void) outnvl;
|
||||
int ret = 0;
|
||||
|
||||
if (strchr(dsname, '@') != NULL || strchr(dsname, '%') != NULL) {
|
||||
@@ -6873,7 +6862,7 @@ out:
|
||||
|
||||
/*
|
||||
* Changes a user's wrapping key used to decrypt a dataset. The keyformat,
|
||||
* keylocation, pbkdf2salt, and pbkdf2iters properties can also be specified
|
||||
* keylocation, pbkdf2salt, and pbkdf2iters properties can also be specified
|
||||
* here to change how the key is derived in userspace.
|
||||
*
|
||||
* innvl: {
|
||||
@@ -6890,10 +6879,10 @@ static const zfs_ioc_key_t zfs_keys_change_key[] = {
|
||||
{"props", DATA_TYPE_NVLIST, ZK_OPTIONAL},
|
||||
};
|
||||
|
||||
/* ARGSUSED */
|
||||
static int
|
||||
zfs_ioc_change_key(const char *dsname, nvlist_t *innvl, nvlist_t *outnvl)
|
||||
{
|
||||
(void) outnvl;
|
||||
int ret;
|
||||
uint64_t cmd = DCP_CMD_NONE;
|
||||
dsl_crypto_params_t *dcp = NULL;
|
||||
@@ -7122,7 +7111,7 @@ zfs_ioctl_init(void)
|
||||
ARRAY_SIZE(zfs_keys_destroy_bookmarks));
|
||||
|
||||
zfs_ioctl_register("receive", ZFS_IOC_RECV_NEW,
|
||||
zfs_ioc_recv_new, zfs_secpolicy_recv_new, DATASET_NAME,
|
||||
zfs_ioc_recv_new, zfs_secpolicy_recv, DATASET_NAME,
|
||||
POOL_CHECK_SUSPENDED | POOL_CHECK_READONLY, B_TRUE, B_TRUE,
|
||||
zfs_keys_recv_new, ARRAY_SIZE(zfs_keys_recv_new));
|
||||
zfs_ioctl_register("load-key", ZFS_IOC_LOAD_KEY,
|
||||
|
||||
Reference in New Issue
Block a user