Page MenuHomeFreeBSD
Differential D37343

stand/ofw: Access the parsing routine more directly
ClosedPublic
Actions

Authored by imp on Nov 10 2022, 5:05 PM.
Tags
None
Referenced Files
Unknown Object (File)
Feb 24 2025, 4:59 PM
Unknown Object (File)
Feb 20 2025, 11:26 PM
Unknown Object (File)
Feb 20 2025, 4:33 PM
Unknown Object (File)
Jan 27 2025, 4:10 PM
Unknown Object (File)
Jan 27 2025, 3:58 AM
Unknown Object (File)
Jan 12 2025, 5:56 AM
Unknown Object (File)
Dec 5 2024, 5:38 PM
Unknown Object (File)
Nov 20 2024, 2:59 AM
View All 61 Files
Subscribers
dab

Details

Reviewers
kevans
manu
Commits
rG69814700c6fb: stand/ofw: Access the parsing routine more directly
rGd16083815caf: stand/ofw: Access the parsing routine more directly
Summary

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

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 48269
Build 45155: arc lint + arc unit

Revision Contents
Changeset List

PathSize
stand/
libofw/
8 lines

Diff 112863

View Options

stand/libofw/devicename.c

Show All 25 Lines
#include <sys/cdefs.h> #include <sys/cdefs.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <stand.h> #include <stand.h>
#include "bootstrap.h" #include "bootstrap.h"
#include "libofw.h" #include "libofw.h"
#include "libzfs.h"
static int ofw_parsedev(struct ofw_devdesc **, const char *, const char **); static int ofw_parsedev(struct ofw_devdesc **, const char *, const char **);
/* /*
* Point (dev) at an allocated device specifier for the device matching the * Point (dev) at an allocated device specifier for the device matching the
* path in (devspec). If it contains an explicit device specification, * path in (devspec). If it contains an explicit device specification,
* use that. If not, use the default device. * use that. If not, use the default device.
*/ */
▲ Show 20 Lines • Show All 64 Lines • ▼ Show 20 Lines
found: found:
if (path != NULL) if (path != NULL)
*path = s; *path = s;
idev = malloc(sizeof(struct ofw_devdesc)); idev = malloc(sizeof(struct ofw_devdesc));
if (idev == NULL) { if (idev == NULL) {
printf("ofw_parsedev: malloc failed\n"); printf("ofw_parsedev: malloc failed\n");
return ENOMEM; return ENOMEM;
} }
strcpy(idev->d_path, name);
idev->dd.d_dev = dv; idev->dd.d_dev = dv;
if (dv->dv_type == DEVT_ZFS) { if (dv->dv_parsedev != NULL) {
p = devspec + strlen(dv->dv_name); p = devspec + strlen(dv->dv_name);
free(idev); free(idev);
err = zfs_parsedev((struct devdesc **)&idev, p, path); err = dv->dv_parsedev((struct devdesc **)&idev, p, path);
if (err != 0) { if (err != 0) {
return (err); return (err);
} }
} else {
strcpy(idev->d_path, name);
} }
if (dev == NULL) { if (dev == NULL) {
free(idev); free(idev);
} else { } else {
*dev = idev; *dev = idev;
} }
return(0); return(0);
Show All 15 Lines