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

stand/ofw: Access the parsing routine more directly

Browse Source 
We don't need to check if something is a ZFS device. Instead, if the
found device has a parse routine, call it. Otherwise, just copy the
path.

Sponsored by:		Netflix
Differential Revision:	https://reviews.freebsd.org/D37343
This commit is contained in:
Warner Losh 2022-11-30 15:09:09 -07:00
parent 910de60a7e
commit d16083815c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stand/libofw/devicename.c
View File

@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$");
#include "bootstrap.h"
#include "libofw.h"
#include "libzfs.h"
static int ofw_parsedev(struct ofw_devdesc **, const char *, const char **);
@ -109,15 +108,16 @@ ofw_parsedev(struct ofw_devdesc **dev, const char *devspec, const char **path)
printf("ofw_parsedev: malloc failed\n");
return ENOMEM;
}
strcpy(idev->d_path, name);
idev->dd.d_dev = dv;
if (dv->dv_type == DEVT_ZFS) {
if (dv->dv_parsedev != NULL) {
p = devspec + strlen(dv->dv_name);
free(idev);
err = zfs_parsedev((struct devdesc **)&idev, p, path);
err = dv->dv_parsedev((struct devdesc **)&idev, p, path);
if (err != 0) {
return (err);
}
} else {
strcpy(idev->d_path, name);
}
if (dev == NULL) {