Page MenuHomeFreeBSD
Files F105531500

D35973.id109186.diff
No OneTemporary
Actions

D35973.id109186.diff
View Options

diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c
--- a/stand/i386/loader/main.c
+++ b/stand/i386/loader/main.c
@@ -387,7 +387,7 @@
#ifdef LOADER_ZFS_SUPPORT
if (new_currdev.dd.d_dev->dv_type == DEVT_ZFS)
- init_zfs_boot_options(zfs_fmtdev(&new_currdev.dd));
+ init_zfs_boot_options(devformat(&new_currdev.dd));
#endif
env_setenv("currdev", EV_VOLATILE, i386_fmtdev(&new_currdev),
diff --git a/stand/i386/zfsboot/zfsboot.c b/stand/i386/zfsboot/zfsboot.c
--- a/stand/i386/zfsboot/zfsboot.c
+++ b/stand/i386/zfsboot/zfsboot.c
@@ -222,11 +222,11 @@
devdesc.d_partition >= 0 ? devdesc.d_partition : 0xff);
/*
- * zfs_fmtdev() can be called only after dv_init
+ * devformat() can be called only after dv_init
*/
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->dd), sizeof (boot_devname));
+ strncpy(boot_devname, devformat(&bdev->dd), sizeof (boot_devname));
if (zfs_get_bootonce(bdev, OS_BOOTONCE, cmd,
sizeof(cmd)) == 0) {
nvlist_t *benv;
diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c
--- a/stand/libsa/zfs/zfs.c
+++ b/stand/libsa/zfs/zfs.c
@@ -1583,7 +1583,7 @@
rv = 0;
/* This device is not set as currdev, mount us private copy. */
if (mount == NULL)
- rv = zfs_mount(zfs_fmtdev(&dev->dd), NULL, (void **)&mount);
+ rv = zfs_mount(devformat(&dev->dd), NULL, (void **)&mount);
if (rv == 0) {
f->f_devdata = mount;
diff --git a/stand/userboot/userboot/main.c b/stand/userboot/userboot/main.c
--- a/stand/userboot/userboot/main.c
+++ b/stand/userboot/userboot/main.c
@@ -260,7 +260,7 @@
bzero(&zdev, sizeof(zdev));
zdev.dd.d_dev = &zfs_dev;
- init_zfs_boot_options(zfs_fmtdev(&zdev.dd));
+ init_zfs_boot_options(devformat(&zdev.dd));
dd = &zdev.dd;
} else
#endif

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 18, 8:32 AM (21 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15482143
Default Alt Text
D35973.id109186.diff (1 KB)

Event Timeline