upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

stand: Change zfs_fmtdev to take a struct devdesc *

Browse source 
Sponsored by:		Netflix
Differential Revision:	https://reviews.freebsd.org/D35974
This commit is contained in:
Warner Losh 2022-08-11 09:05:15 -06:00
parent c32dde3166
commit d2d4e1271b
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stand/i386/loader/main.c
View file

@ -387,7 +387,7 @@ extract_currdev(void)
#ifdef LOADER_ZFS_SUPPORT
if (new_currdev.dd.d_dev->dv_type == DEVT_ZFS)
init_zfs_boot_options(zfs_fmtdev(&new_currdev));
init_zfs_boot_options(zfs_fmtdev(&new_currdev.dd));
#endif
env_setenv("currdev", EV_VOLATILE, i386_fmtdev(&new_currdev),

2
stand/i386/zfsboot/zfsboot.c
View file

@ -226,7 +226,7 @@ main(void)
*/
if (bdev != NULL && bdev->dd.d_dev->dv_type == DEVT_ZFS) {
/* set up proper device name string for ZFS */
strncpy(boot_devname, zfs_fmtdev(bdev), sizeof (boot_devname));
strncpy(boot_devname, zfs_fmtdev(&bdev->dd), sizeof (boot_devname));
if (zfs_get_bootonce(bdev, OS_BOOTONCE, cmd,
sizeof(cmd)) == 0) {
nvlist_t *benv;

2
stand/libsa/zfs/devicename_stubs.c
View file

@ -39,7 +39,7 @@ zfs_parsedev(struct zfs_devdesc *dev, const char *devspec, const char **path)
__attribute__((weak))
char *
zfs_fmtdev(void *vdev)
zfs_fmtdev(struct devdesc *vdev)
{
static char buf[128];

2
stand/libsa/zfs/libzfs.h
View file

@ -50,7 +50,7 @@ struct zfs_devdesc {
int zfs_parsedev(struct zfs_devdesc *dev, const char *devspec,
const char **path);
char *zfs_fmtdev(void *vdev);
char *zfs_fmtdev(struct devdesc *);
int zfs_probe_dev(const char *devname, uint64_t *pool_guid);
int zfs_list(const char *name);
int zfs_get_bootonce(void *, const char *, char *, size_t);

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

@ -1583,7 +1583,7 @@ zfs_dev_open(struct open_file *f, ...)
rv = 0;
/* This device is not set as currdev, mount us private copy. */
if (mount == NULL)
rv = zfs_mount(zfs_fmtdev(dev), NULL, (void **)&mount);
rv = zfs_mount(zfs_fmtdev(&dev->dd), NULL, (void **)&mount);
if (rv == 0) {
f->f_devdata = mount;
@ -1681,7 +1681,7 @@ zfs_parsedev(struct zfs_devdesc *dev, const char *devspec, const char **path)
}
char *
zfs_fmtdev(void *vdev)
zfs_fmtdev(struct devdesc *vdev)
{
static char rootname[ZFS_MAXNAMELEN];
static char buf[2 * ZFS_MAXNAMELEN + 8];
@ -1689,7 +1689,7 @@ zfs_fmtdev(void *vdev)
spa_t *spa;
buf[0] = '\0';
if (dev->dd.d_dev->dv_type != DEVT_ZFS)
if (vdev->d_dev->dv_type != DEVT_ZFS)
return (buf);
/* Do we have any pools? */

2
stand/userboot/userboot/main.c
View file

@ -260,7 +260,7 @@ extract_currdev(void)
bzero(&zdev, sizeof(zdev));
zdev.dd.d_dev = &zfs_dev;
init_zfs_boot_options(zfs_fmtdev(&zdev));
init_zfs_boot_options(zfs_fmtdev(&zdev.dd));
dd = &zdev.dd;
} else
#endif