d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbe: Avoid double printing cloning errors.

Browse Source 
be_clone calls be_clone_cb and both call set_error on the return
error path.  set_error prints the error resulting in a double print.
be_clone_cb should just return the error code and allow be_clone
to print it.

PR: 265248
Reported by: Graham Perrin
Reviewed by: imp, kevans
Pull Request: https://github.com/freebsd/freebsd-src/pull/685
This commit is contained in:
John Grafton 2023-03-14 21:14:14 -06:00 committed by Warner Losh
parent 0b0ae2e4cd
commit 8e933d9c59
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libbe/be.c
View File

@ -745,11 +745,11 @@ be_clone_cb(zfs_handle_t *ds, void *data)
/* construct the boot environment path from the dataset we're cloning */ /* construct the boot environment path from the dataset we're cloning */
if (be_get_path(ldc, dspath, be_path, sizeof(be_path)) != BE_ERR_SUCCESS) if (be_get_path(ldc, dspath, be_path, sizeof(be_path)) != BE_ERR_SUCCESS)
return (set_error(ldc->lbh, BE_ERR_UNKNOWN)); return (BE_ERR_UNKNOWN);
/* the dataset to be created (i.e. the boot environment) already exists */ /* the dataset to be created (i.e. the boot environment) already exists */
if (zfs_dataset_exists(ldc->lbh->lzh, be_path, ZFS_TYPE_DATASET)) if (zfs_dataset_exists(ldc->lbh->lzh, be_path, ZFS_TYPE_DATASET))
return (set_error(ldc->lbh, BE_ERR_EXISTS)); return (BE_ERR_EXISTS);
/* no snapshot found for this dataset, silently skip it */ /* no snapshot found for this dataset, silently skip it */
if (!zfs_dataset_exists(ldc->lbh->lzh, snap_path, ZFS_TYPE_SNAPSHOT)) if (!zfs_dataset_exists(ldc->lbh->lzh, snap_path, ZFS_TYPE_SNAPSHOT))
@ -757,7 +757,7 @@ be_clone_cb(zfs_handle_t *ds, void *data)
if ((snap_hdl = if ((snap_hdl =
zfs_open(ldc->lbh->lzh, snap_path, ZFS_TYPE_SNAPSHOT)) == NULL) zfs_open(ldc->lbh->lzh, snap_path, ZFS_TYPE_SNAPSHOT)) == NULL)
return (set_error(ldc->lbh, BE_ERR_ZFSOPEN)); return (BE_ERR_ZFSOPEN);
nvlist_alloc(&props, NV_UNIQUE_NAME, KM_SLEEP); nvlist_alloc(&props, NV_UNIQUE_NAME, KM_SLEEP);
nvlist_add_string(props, "canmount", "noauto"); nvlist_add_string(props, "canmount", "noauto");
@ -770,7 +770,7 @@ be_clone_cb(zfs_handle_t *ds, void *data)
return (-1); return (-1);
if ((err = zfs_clone(snap_hdl, be_path, props)) != 0) if ((err = zfs_clone(snap_hdl, be_path, props)) != 0)
return (set_error(ldc->lbh, BE_ERR_ZFSCLONE)); return (BE_ERR_ZFSCLONE);
nvlist_free(props); nvlist_free(props);
zfs_close(snap_hdl); zfs_close(snap_hdl);
@ -781,7 +781,7 @@ be_clone_cb(zfs_handle_t *ds, void *data)
ldc->depth--; ldc->depth--;
} }
return (set_error(ldc->lbh, err)); return (err);
} }
/* /*