Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Aug 2022 17:53:53 -0600
From:      Warner Losh <imp@bsdimp.com>
To:        Ravi Pokala <rpokala@freebsd.org>
Cc:        Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>,  "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, dev-commits-src-main@freebsd.org
Subject:   Re: d2d4e1271b33 - main - stand: Change zfs_fmtdev to take a struct devdesc *
Message-ID:  <CANCZdfq0_h-9Onyc_AfH5BT9Uo7TR=7DRQk0_i0MwpTri=dVbQ@mail.gmail.com>
In-Reply-To: <92FCDDE0-A87F-46B6-A6AF-7101355A2E81@panasas.com>
References:  <202208111627.27BGRcsM055305@gitrepo.freebsd.org> <92FCDDE0-A87F-46B6-A6AF-7101355A2E81@panasas.com>

next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000006b7e5305e5ffe167
Content-Type: text/plain; charset="UTF-8"

On Thu, Aug 11, 2022 at 5:47 PM Ravi Pokala <rpokala@freebsd.org> wrote:

> -----Original Message-----
> From: <owner-src-committers@freebsd.org> on behalf of Warner Losh
> <imp@FreeBSD.org>
> Date: 2022-08-11, Thursday at 09:27
> To: <src-committers@FreeBSD.org>, <dev-commits-src-all@FreeBSD.org>,
> <dev-commits-src-main@FreeBSD.org>
> Subject: git: d2d4e1271b33 - main - stand: Change zfs_fmtdev to take a
> struct devdesc *
>
>     The branch main has been updated by imp:
>
>     URL:
> https://cgit.FreeBSD.org/src/commit/?id=d2d4e1271b33b233f57fd18a61a1b5c1b0aeb355
>
>     commit d2d4e1271b33b233f57fd18a61a1b5c1b0aeb355
>     Author:     Warner Losh <imp@FreeBSD.org>
>     AuthorDate: 2022-08-11 15:05:15 +0000
>     Commit:     Warner Losh <imp@FreeBSD.org>
>     CommitDate: 2022-08-11 16:27:15 +0000
>
>         stand: Change zfs_fmtdev to take a struct devdesc *
>
> Yes, but why?
>

So it can be used in the newly minted (though after this commit) dv_fmtdev.
I did so many I didn't
put that reason in each and every commit message.


> Also, shouldn't the other places in zfs_fmtdev() that use 'dev->dd.' be
> updated to use 'vdev->'?
>

I believe I updated everything that should be updated. But if I've missed
something, I'm happy to discuss it.

Warner


> Thanks,
>
> Ravi (rpokala@)
>
>         Sponsored by:           Netflix
>         Differential Revision:  https://reviews.freebsd.org/D35974
>     ---
>      stand/i386/loader/main.c           | 2 +-
>      stand/i386/zfsboot/zfsboot.c       | 2 +-
>      stand/libsa/zfs/devicename_stubs.c | 2 +-
>      stand/libsa/zfs/libzfs.h           | 2 +-
>      stand/libsa/zfs/zfs.c              | 6 +++---
>      stand/userboot/userboot/main.c     | 2 +-
>      6 files changed, 8 insertions(+), 8 deletions(-)
>
>     diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c
>     index 29c40921a85a..4d5a0a98a08e 100644
>     --- a/stand/i386/loader/main.c
>     +++ b/stand/i386/loader/main.c
>     @@ -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),
>     diff --git a/stand/i386/zfsboot/zfsboot.c
> b/stand/i386/zfsboot/zfsboot.c
>     index b68d80e802c2..52fd41688a17 100644
>     --- a/stand/i386/zfsboot/zfsboot.c
>     +++ b/stand/i386/zfsboot/zfsboot.c
>     @@ -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;
>     diff --git a/stand/libsa/zfs/devicename_stubs.c
> b/stand/libsa/zfs/devicename_stubs.c
>     index 41bf907e0cf1..e58bc9c40e35 100644
>     --- a/stand/libsa/zfs/devicename_stubs.c
>     +++ b/stand/libsa/zfs/devicename_stubs.c
>     @@ -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];
>
>     diff --git a/stand/libsa/zfs/libzfs.h b/stand/libsa/zfs/libzfs.h
>     index e8676c0d53b8..2f0dfd8afc86 100644
>     --- a/stand/libsa/zfs/libzfs.h
>     +++ b/stand/libsa/zfs/libzfs.h
>     @@ -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);
>     diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c
>     index 71e3a49c2929..5392bcaa4fb1 100644
>     --- a/stand/libsa/zfs/zfs.c
>     +++ b/stand/libsa/zfs/zfs.c
>     @@ -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? */
>     diff --git a/stand/userboot/userboot/main.c
> b/stand/userboot/userboot/main.c
>     index 07630945cf80..d3f12ab1675e 100644
>     --- a/stand/userboot/userboot/main.c
>     +++ b/stand/userboot/userboot/main.c
>     @@ -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
>
>
>

--0000000000006b7e5305e5ffe167
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">=
<div dir=3D"ltr" class=3D"gmail_attr">On Thu, Aug 11, 2022 at 5:47 PM Ravi =
Pokala &lt;<a href=3D"mailto:rpokala@freebsd.org">rpokala@freebsd.org</a>&g=
t; wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0p=
x 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">-----O=
riginal Message-----<br>
From: &lt;<a href=3D"mailto:owner-src-committers@freebsd.org" target=3D"_bl=
ank">owner-src-committers@freebsd.org</a>&gt; on behalf of Warner Losh &lt;=
imp@FreeBSD.org&gt;<br>
Date: 2022-08-11, Thursday at 09:27<br>
To: &lt;src-committers@FreeBSD.org&gt;, &lt;dev-commits-src-all@FreeBSD.org=
&gt;, &lt;dev-commits-src-main@FreeBSD.org&gt;<br>
Subject: git: d2d4e1271b33 - main - stand: Change zfs_fmtdev to take a stru=
ct devdesc *<br>
<br>
=C2=A0 =C2=A0 The branch main has been updated by imp:<br>
<br>
=C2=A0 =C2=A0 URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3Dd2d=
4e1271b33b233f57fd18a61a1b5c1b0aeb355" rel=3D"noreferrer" target=3D"_blank"=
>https://cgit.FreeBSD.org/src/commit/?id=3Dd2d4e1271b33b233f57fd18a61a1b5c1=
b0aeb355</a><br>
<br>
=C2=A0 =C2=A0 commit d2d4e1271b33b233f57fd18a61a1b5c1b0aeb355<br>
=C2=A0 =C2=A0 Author:=C2=A0 =C2=A0 =C2=A0Warner Losh &lt;imp@FreeBSD.org&gt=
;<br>
=C2=A0 =C2=A0 AuthorDate: 2022-08-11 15:05:15 +0000<br>
=C2=A0 =C2=A0 Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh &lt;imp@FreeBSD.org&gt=
;<br>
=C2=A0 =C2=A0 CommitDate: 2022-08-11 16:27:15 +0000<br>
<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 stand: Change zfs_fmtdev to take a struct devde=
sc *<br>
<br>
Yes, but why?<br></blockquote><div><br></div><div>So it can be used in the =
newly minted (though after this commit) dv_fmtdev. I did so many I didn&#39=
;t</div><div>put that reason in each and every commit message.</div><div>=
=C2=A0</div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0=
.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
Also, shouldn&#39;t the other places in zfs_fmtdev() that use &#39;dev-&gt;=
dd.&#39; be updated to use &#39;vdev-&gt;&#39;?<br></blockquote><div><br></=
div><div>I believe I updated everything that should be updated. But if I&#3=
9;ve missed something, I&#39;m happy to discuss it.</div><div><br></div><di=
v>Warner</div><div>=C2=A0</div><blockquote class=3D"gmail_quote" style=3D"m=
argin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left=
:1ex">
Thanks,<br>
<br>
Ravi (rpokala@)<br>
<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
 =C2=A0Netflix<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 Differential Revision:=C2=A0 <a href=3D"https:/=
/reviews.freebsd.org/D35974" rel=3D"noreferrer" target=3D"_blank">https://r=
eviews.freebsd.org/D35974</a><br>
=C2=A0 =C2=A0 ---<br>
=C2=A0 =C2=A0 =C2=A0stand/i386/loader/main.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0| 2 +-<br>
=C2=A0 =C2=A0 =C2=A0stand/i386/zfsboot/zfsboot.c=C2=A0 =C2=A0 =C2=A0 =C2=A0=
| 2 +-<br>
=C2=A0 =C2=A0 =C2=A0stand/libsa/zfs/devicename_stubs.c | 2 +-<br>
=C2=A0 =C2=A0 =C2=A0stand/libsa/zfs/libzfs.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0| 2 +-<br>
=C2=A0 =C2=A0 =C2=A0stand/libsa/zfs/zfs.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
 =C2=A0 =C2=A0 | 6 +++---<br>
=C2=A0 =C2=A0 =C2=A0stand/userboot/userboot/main.c=C2=A0 =C2=A0 =C2=A0| 2 +=
-<br>
=C2=A0 =C2=A0 =C2=A06 files changed, 8 insertions(+), 8 deletions(-)<br>
<br>
=C2=A0 =C2=A0 diff --git a/stand/i386/loader/main.c b/stand/i386/loader/mai=
n.c<br>
=C2=A0 =C2=A0 index 29c40921a85a..4d5a0a98a08e 100644<br>
=C2=A0 =C2=A0 --- a/stand/i386/loader/main.c<br>
=C2=A0 =C2=A0 +++ b/stand/i386/loader/main.c<br>
=C2=A0 =C2=A0 @@ -387,7 +387,7 @@ extract_currdev(void)<br>
<br>
=C2=A0 =C2=A0 =C2=A0#ifdef LOADER_ZFS_SUPPORT<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (new_currdev.dd.d_dev-&gt;dv_type =3D=3D DEV=
T_ZFS)<br>
=C2=A0 =C2=A0 -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0init_zfs_boot_optio=
ns(zfs_fmtdev(&amp;new_currdev));<br>
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0init_zfs_boot_optio=
ns(zfs_fmtdev(&amp;new_currdev.dd));<br>
=C2=A0 =C2=A0 =C2=A0#endif<br>
<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 env_setenv(&quot;currdev&quot;, EV_VOLATILE, i3=
86_fmtdev(&amp;new_currdev),<br>
=C2=A0 =C2=A0 diff --git a/stand/i386/zfsboot/zfsboot.c b/stand/i386/zfsboo=
t/zfsboot.c<br>
=C2=A0 =C2=A0 index b68d80e802c2..52fd41688a17 100644<br>
=C2=A0 =C2=A0 --- a/stand/i386/zfsboot/zfsboot.c<br>
=C2=A0 =C2=A0 +++ b/stand/i386/zfsboot/zfsboot.c<br>
=C2=A0 =C2=A0 @@ -226,7 +226,7 @@ main(void)<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*/<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (bdev !=3D NULL &amp;&amp; bdev-&gt;dd.d_dev=
-&gt;dv_type =3D=3D DEVT_ZFS) {<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* set up proper de=
vice name string for ZFS */<br>
=C2=A0 =C2=A0 -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0strncpy(boot_devnam=
e, zfs_fmtdev(bdev), sizeof (boot_devname));<br>
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0strncpy(boot_devnam=
e, zfs_fmtdev(&amp;bdev-&gt;dd), sizeof (boot_devname));<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (zfs_get_bootonc=
e(bdev, OS_BOOTONCE, cmd,<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 sizeo=
f(cmd)) =3D=3D 0) {<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 nvlist_t *benv;<br>
=C2=A0 =C2=A0 diff --git a/stand/libsa/zfs/devicename_stubs.c b/stand/libsa=
/zfs/devicename_stubs.c<br>
=C2=A0 =C2=A0 index 41bf907e0cf1..e58bc9c40e35 100644<br>
=C2=A0 =C2=A0 --- a/stand/libsa/zfs/devicename_stubs.c<br>
=C2=A0 =C2=A0 +++ b/stand/libsa/zfs/devicename_stubs.c<br>
=C2=A0 =C2=A0 @@ -39,7 +39,7 @@ zfs_parsedev(struct zfs_devdesc *dev, const=
 char *devspec, const char **path)<br>
<br>
=C2=A0 =C2=A0 =C2=A0__attribute__((weak))<br>
=C2=A0 =C2=A0 =C2=A0char *<br>
=C2=A0 =C2=A0 -zfs_fmtdev(void *vdev)<br>
=C2=A0 =C2=A0 +zfs_fmtdev(struct devdesc *vdev)<br>
=C2=A0 =C2=A0 =C2=A0{<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0static char=C2=A0 =C2=A0 buf[128];<br>
<br>
=C2=A0 =C2=A0 diff --git a/stand/libsa/zfs/libzfs.h b/stand/libsa/zfs/libzf=
s.h<br>
=C2=A0 =C2=A0 index e8676c0d53b8..2f0dfd8afc86 100644<br>
=C2=A0 =C2=A0 --- a/stand/libsa/zfs/libzfs.h<br>
=C2=A0 =C2=A0 +++ b/stand/libsa/zfs/libzfs.h<br>
=C2=A0 =C2=A0 @@ -50,7 +50,7 @@ struct zfs_devdesc {<br>
<br>
=C2=A0 =C2=A0 =C2=A0int=C2=A0 =C2=A0 =C2=A0 =C2=A0 zfs_parsedev(struct zfs_=
devdesc *dev, const char *devspec,<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0const char **path);<br>
=C2=A0 =C2=A0 -char=C2=A0 =C2=A0 =C2=A0 =C2=A0*zfs_fmtdev(void *vdev);<br>
=C2=A0 =C2=A0 +char=C2=A0 =C2=A0 =C2=A0 =C2=A0*zfs_fmtdev(struct devdesc *)=
;<br>
=C2=A0 =C2=A0 =C2=A0int=C2=A0 =C2=A0 =C2=A0 =C2=A0 zfs_probe_dev(const char=
 *devname, uint64_t *pool_guid);<br>
=C2=A0 =C2=A0 =C2=A0int=C2=A0 =C2=A0 =C2=A0 =C2=A0 zfs_list(const char *nam=
e);<br>
=C2=A0 =C2=A0 =C2=A0int=C2=A0 =C2=A0 =C2=A0 =C2=A0 zfs_get_bootonce(void *,=
 const char *, char *, size_t);<br>
=C2=A0 =C2=A0 diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c<br=
>
=C2=A0 =C2=A0 index 71e3a49c2929..5392bcaa4fb1 100644<br>
=C2=A0 =C2=A0 --- a/stand/libsa/zfs/zfs.c<br>
=C2=A0 =C2=A0 +++ b/stand/libsa/zfs/zfs.c<br>
=C2=A0 =C2=A0 @@ -1583,7 +1583,7 @@ zfs_dev_open(struct open_file *f, ...)<=
br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 rv =3D 0;<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /* This device is not set as currdev, mount us =
private copy. */<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (mount =3D=3D NULL)<br>
=C2=A0 =C2=A0 -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rv =3D zfs_mount(zf=
s_fmtdev(dev), NULL, (void **)&amp;mount);<br>
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rv =3D zfs_mount(zf=
s_fmtdev(&amp;dev-&gt;dd), NULL, (void **)&amp;mount);<br>
<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (rv =3D=3D 0) {<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 f-&gt;f_devdata =3D=
 mount;<br>
=C2=A0 =C2=A0 @@ -1681,7 +1681,7 @@ zfs_parsedev(struct zfs_devdesc *dev, c=
onst char *devspec, const char **path)<br>
=C2=A0 =C2=A0 =C2=A0}<br>
<br>
=C2=A0 =C2=A0 =C2=A0char *<br>
=C2=A0 =C2=A0 -zfs_fmtdev(void *vdev)<br>
=C2=A0 =C2=A0 +zfs_fmtdev(struct devdesc *vdev)<br>
=C2=A0 =C2=A0 =C2=A0{<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 static char=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0rootname[ZFS_MAXNAMELEN];<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 static char=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0buf[2 * ZFS_MAXNAMELEN + 8];<br>
=C2=A0 =C2=A0 @@ -1689,7 +1689,7 @@ zfs_fmtdev(void *vdev)<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 spa_t=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0*spa;<br>
<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 buf[0] =3D &#39;\0&#39;;<br>
=C2=A0 =C2=A0 -=C2=A0 =C2=A0if (dev-&gt;dd.d_dev-&gt;dv_type !=3D DEVT_ZFS)=
<br>
=C2=A0 =C2=A0 +=C2=A0 =C2=A0if (vdev-&gt;d_dev-&gt;dv_type !=3D DEVT_ZFS)<b=
r>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (buf);<br>
<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /* Do we have any pools? */<br>
=C2=A0 =C2=A0 diff --git a/stand/userboot/userboot/main.c b/stand/userboot/=
userboot/main.c<br>
=C2=A0 =C2=A0 index 07630945cf80..d3f12ab1675e 100644<br>
=C2=A0 =C2=A0 --- a/stand/userboot/userboot/main.c<br>
=C2=A0 =C2=A0 +++ b/stand/userboot/userboot/main.c<br>
=C2=A0 =C2=A0 @@ -260,7 +260,7 @@ extract_currdev(void)<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 bzero(&amp;zdev, si=
zeof(zdev));<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 zdev.dd.d_dev =3D &=
amp;zfs_dev;<br>
<br>
=C2=A0 =C2=A0 -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0init_zfs_boot_optio=
ns(zfs_fmtdev(&amp;zdev));<br>
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0init_zfs_boot_optio=
ns(zfs_fmtdev(&amp;zdev.dd));<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 dd =3D &amp;zdev.dd=
;<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 } else<br>
=C2=A0 =C2=A0 =C2=A0#endif<br>
<br>
<br>
</blockquote></div></div>

--0000000000006b7e5305e5ffe167--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfq0_h-9Onyc_AfH5BT9Uo7TR=7DRQk0_i0MwpTri=dVbQ>