system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

stand/zfs: Refactor zfs_set_bootenv

Browse source 
Refactor zfs_set_bootenv to split out the lookup of spa from the
rest. zfs_set_bootenv_spa flushes the benv to the vdevs and updates the
cached benv.

Sponsored by:		Netflix
Reviewed by:		tsoome, kevans
Differential Revision:	https://reviews.freebsd.org/D39410
This commit is contained in:
Warner Losh 2023-05-01 09:26:59 -06:00
parent 6479bd1b7d
commit 4dcae288fe
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
stand/libsa/zfs/zfs.c
View file

@ -812,22 +812,12 @@ zfs_get_bootenv(void *vdev, nvlist_t **benvp)
int
zfs_set_bootenv(void *vdev, nvlist_t *benv)
{
struct zfs_devdesc *dev = (struct zfs_devdesc *)vdev;
spa_t *spa;
vdev_t *vd;
if (dev->dd.d_dev->dv_type != DEVT_ZFS)
return (ENOTSUP);
if ((spa = spa_find_by_dev(dev)) == NULL)
if ((spa = spa_find_by_dev((struct zfs_devdesc *)vdev)) == NULL)
return (ENXIO);
STAILQ_FOREACH(vd, &spa->spa_root_vdev->v_children, v_childlink) {
vdev_write_bootenv(vd, benv);
}
spa->spa_bootenv = benv;
return (0);
return (zfs_set_bootenv_spa(spa, benv));
}
/*

16
stand/libsa/zfs/zfsimpl.c
View file

@ -3883,3 +3883,19 @@ zfs_get_bootenv_spa(spa_t *spa, nvlist_t **benvp)
*benvp = benv;
return (0);
}
/*
* Store nvlist to pool label bootenv area. Also updates cached pointer in spa.
*/
static int
zfs_set_bootenv_spa(spa_t *spa, nvlist_t *benv)
{
vdev_t *vd;
STAILQ_FOREACH(vd, &spa->spa_root_vdev->v_children, v_childlink) {
vdev_write_bootenv(vd, benv);
}
spa->spa_bootenv = benv;
return (0);
}