Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

libzfs: sendrecv: fix unused, remove argsused 

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12906
This commit is contained in:
наб 2022-01-28 16:34:48 +01:00 committed by GitHub
parent c70bb2f610
commit 7633c0aedd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/libzfs/libzfs_sendrecv.c
View File

@ -3101,7 +3101,7 @@ created_before(libzfs_handle_t *hdl, avl_tree_t *avl,
*/ */
static int static int
recv_fix_encryption_hierarchy(libzfs_handle_t *hdl, const char *top_zfs, recv_fix_encryption_hierarchy(libzfs_handle_t *hdl, const char *top_zfs,
nvlist_t *stream_nv, avl_tree_t *stream_avl) nvlist_t *stream_nv)
{ {
int err; int err;
nvpair_t *fselem = NULL; nvpair_t *fselem = NULL;
@ -3728,7 +3728,7 @@ zfs_receive_package(libzfs_handle_t *hdl, int fd, const char *destname,
if (raw && softerr == 0 && *top_zfs != NULL) { if (raw && softerr == 0 && *top_zfs != NULL) {
softerr = recv_fix_encryption_hierarchy(hdl, *top_zfs, softerr = recv_fix_encryption_hierarchy(hdl, *top_zfs,
stream_nv, stream_avl); stream_nv);
} }
out: out:
@ -4991,7 +4991,7 @@ zfs_receive_checkprops(libzfs_handle_t *hdl, nvlist_t *props,
if (prop == ZPROP_INVAL) { if (prop == ZPROP_INVAL) {
if (!zfs_prop_user(name)) { if (!zfs_prop_user(name)) {
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"invalid property '%s'"), name); "%s: invalid property '%s'"), errbuf, name);
return (B_FALSE); return (B_FALSE);
} }
continue; continue;
@ -5015,7 +5015,7 @@ zfs_receive_checkprops(libzfs_handle_t *hdl, nvlist_t *props,
if (zfs_prop_readonly(prop) || prop == ZFS_PROP_VERSION || if (zfs_prop_readonly(prop) || prop == ZFS_PROP_VERSION ||
prop == ZFS_PROP_VOLSIZE) { prop == ZFS_PROP_VOLSIZE) {
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"invalid property '%s'"), name); "%s: invalid property '%s'"), errbuf, name);
return (B_FALSE); return (B_FALSE);
} }
} }
@ -5041,9 +5041,8 @@ zfs_receive_impl(libzfs_handle_t *hdl, const char *tosnap,
"cannot receive")); "cannot receive"));
/* check cmdline props, raise an error if they cannot be received */ /* check cmdline props, raise an error if they cannot be received */
if (!zfs_receive_checkprops(hdl, cmdprops, errbuf)) { if (!zfs_receive_checkprops(hdl, cmdprops, errbuf))
return (zfs_error(hdl, EZFS_BADPROP, errbuf)); return (-1);
}
if (flags->isprefix && if (flags->isprefix &&
!zfs_dataset_exists(hdl, tosnap, ZFS_TYPE_DATASET)) { !zfs_dataset_exists(hdl, tosnap, ZFS_TYPE_DATASET)) {