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

stand/kboot: Simplify

Browse Source 
There's plenty of stack in kboot, so use it here rather than the
malloc/free dance.

Sponsored by:		Netflix
Reviewed by:		tsoome, kevans
Differential Revision:	https://reviews.freebsd.org/D39416
This commit is contained in:
Warner Losh 2023-05-01 09:28:32 -06:00
parent d5babd0d23
commit 5328f9034f
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
stand/kboot/hostdisk.c
View File

@ -574,7 +574,6 @@ probe_zfs_currdev(uint64_t pool_guid, uint64_t root_guid, bool setcurrdev)
{
char *devname;
struct zfs_devdesc currdev;
char *buf = NULL;
bool bootable;
currdev.dd.d_dev = &zfs_dev;
@ -587,18 +586,15 @@ probe_zfs_currdev(uint64_t pool_guid, uint64_t root_guid, bool setcurrdev)
bootable = sanity_check_currdev();
if (bootable) {
buf = malloc(VDEV_PAD_SIZE);
if (buf != NULL) {
if (zfs_get_bootonce(&currdev, OS_BOOTONCE, buf,
VDEV_PAD_SIZE) == 0) {
printf("zfs bootonce: %s\n", buf);
if (setcurrdev)
set_currdev(buf);
setenv("zfs-bootonce", buf, 1);
}
free(buf);
(void)zfs_attach_nvstore(&currdev);
char buf[VDEV_PAD_SIZE];
if (zfs_get_bootonce(&currdev, OS_BOOTONCE, buf, sizeof(buf)) == 0) {
printf("zfs bootonce: %s\n", buf);
if (setcurrdev)
set_currdev(buf);
setenv("zfs-bootonce", buf, 1);
}
(void)zfs_attach_nvstore(&currdev);
init_zfs_boot_options(devname);
}
return (bootable);