From nobody Thu Aug 11 23:53:53 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M3kDG44sWz4YsC0 for ; Thu, 11 Aug 2022 23:54:06 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vk1-xa2e.google.com (mail-vk1-xa2e.google.com [IPv6:2607:f8b0:4864:20::a2e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M3kDF6B5Lz3qRs for ; Thu, 11 Aug 2022 23:54:05 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vk1-xa2e.google.com with SMTP id b81so9734622vkf.1 for ; Thu, 11 Aug 2022 16:54:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=Alg4Y7+5XnG3ol/In8B+4qA1nTy3UUxMEfq+Z1eY5Po=; b=FvCT+xnhefn7PpCa54gufHavvfLkrLv6wmOtqow2IFiRNGq1JxMGuT92E6fmy2T/Ts xSPLYNJ/el+z8vlRuaeSsLsVUSS2T+Wq4a2fUk5meMeTVS4GKZCwQfp6iFyCNEoCv2rC xDIgq4DOwe4Os7G5yT/fxcHDjv2LMO9Q5SyDastZ/zpA54VeUBYHtdWLwitBL5+Qz2mO 9r6x7Mpjyc+20mZHkD2+DHXy3JCtOWrrYCV4TG0n+SExJo0o0KXdkv9Zbs53mKOwxPid NOYo8xyvSLdrXNyEW68MUXhDY0K2evqtW4J4H+Oy4OnsZsre0RsLfHTzo0az5RJII3iM cu/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=Alg4Y7+5XnG3ol/In8B+4qA1nTy3UUxMEfq+Z1eY5Po=; b=L4TYCDeJgp5hOGCZlMDsD0Y5sclk+CEbtcuPpyoGGqog9pzXyW86nRXnd+ckgZXYVk PK02jAUqc86i/1QmZ1hTDrQygy55uCfXpOkFFnTfyuGBoO/fu/8DEZWjw5uYnVW8i1cW emJV/sQ+Vmjmg1p7fmRIzTTMwvSJzhOJR1SafhB+4vRgry/lTlFU1whiEObJTfH06w72 qf/Q1Rq+cF1aBOjt2MuSu5jKAmfIT3eSWVWA5XUsVq84++jwB5xFpsT3TDKklNzW7sZN ztle7cQhrPu3SP/EIyTBIgQ+uFungaAPCd6SyzYBo4724bHSpKgmf0GSz6VNVxy27ra3 TPJA== X-Gm-Message-State: ACgBeo2O+X0hRhSBsdT3aVpuFkz8DP8Fpfhx2skQ+EV/OJiaIE1cPO12 4WZGp/y9qqIXr5h9F6F3dlihM3VrpmntJZwI/UHEyw== X-Google-Smtp-Source: AA6agR5pBMnRlaGYDy5bSJw4QlIlN1XKTEFGrtrTPSTP/J1LqA3GSkGa/O9NETPSl7AZw3Miira8kaxkoEXkHv+ORms= X-Received: by 2002:a05:6122:11a4:b0:377:d5aa:6f4e with SMTP id y4-20020a05612211a400b00377d5aa6f4emr812386vkn.33.1660262044886; Thu, 11 Aug 2022 16:54:04 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202208111627.27BGRcsM055305@gitrepo.freebsd.org> <92FCDDE0-A87F-46B6-A6AF-7101355A2E81@panasas.com> In-Reply-To: <92FCDDE0-A87F-46B6-A6AF-7101355A2E81@panasas.com> From: Warner Losh Date: Thu, 11 Aug 2022 17:53:53 -0600 Message-ID: Subject: Re: d2d4e1271b33 - main - stand: Change zfs_fmtdev to take a struct devdesc * To: Ravi Pokala Cc: Warner Losh , src-committers , "" , dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000006b7e5305e5ffe167" X-Rspamd-Queue-Id: 4M3kDF6B5Lz3qRs X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b=FvCT+xnh; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::a2e) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20210112.gappssmtp.com:s=20210112]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::a2e:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+,1:+,2:~]; R_SPF_NA(0.00)[no SPF record]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; RCPT_COUNT_FIVE(0.00)[5]; DMARC_NA(0.00)[bsdimp.com]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] X-ThisMailContainsUnwantedMimeParts: N --0000000000006b7e5305e5ffe167 Content-Type: text/plain; charset="UTF-8" On Thu, Aug 11, 2022 at 5:47 PM Ravi Pokala wrote: > -----Original Message----- > From: on behalf of Warner Losh > > Date: 2022-08-11, Thursday at 09:27 > To: , , > > 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 > AuthorDate: 2022-08-11 15:05:15 +0000 > Commit: Warner Losh > 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


=
On Thu, Aug 11, 2022 at 5:47 PM Ravi = Pokala <rpokala@freebsd.org&g= t; wrote:
-----O= riginal 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 stru= ct devdesc *

=C2=A0 =C2=A0 The branch main has been updated by imp:

=C2=A0 =C2=A0 URL: https://cgit.FreeBSD.org/src/commit/?id=3Dd2d4e1271b33b233f57fd18a61a1b5c1= b0aeb355

=C2=A0 =C2=A0 commit d2d4e1271b33b233f57fd18a61a1b5c1b0aeb355
=C2=A0 =C2=A0 Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>= ;
=C2=A0 =C2=A0 AuthorDate: 2022-08-11 15:05:15 +0000
=C2=A0 =C2=A0 Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>= ;
=C2=A0 =C2=A0 CommitDate: 2022-08-11 16:27:15 +0000

=C2=A0 =C2=A0 =C2=A0 =C2=A0 stand: Change zfs_fmtdev to take a struct devde= sc *

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.
= =C2=A0
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= 9;ve missed something, I'm happy to discuss it.

Warner
=C2=A0
Thanks,

Ravi (rpokala@)

=C2=A0 =C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0Netflix
=C2=A0 =C2=A0 =C2=A0 =C2=A0 Differential Revision:=C2=A0 https://r= eviews.freebsd.org/D35974
=C2=A0 =C2=A0 ---
=C2=A0 =C2=A0 =C2=A0stand/i386/loader/main.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0| 2 +-
=C2=A0 =C2=A0 =C2=A0stand/i386/zfsboot/zfsboot.c=C2=A0 =C2=A0 =C2=A0 =C2=A0= | 2 +-
=C2=A0 =C2=A0 =C2=A0stand/libsa/zfs/devicename_stubs.c | 2 +-
=C2=A0 =C2=A0 =C2=A0stand/libsa/zfs/libzfs.h=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0| 2 +-
=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 +++---
=C2=A0 =C2=A0 =C2=A0stand/userboot/userboot/main.c=C2=A0 =C2=A0 =C2=A0| 2 += -
=C2=A0 =C2=A0 =C2=A06 files changed, 8 insertions(+), 8 deletions(-)

=C2=A0 =C2=A0 diff --git a/stand/i386/loader/main.c b/stand/i386/loader/mai= n.c
=C2=A0 =C2=A0 index 29c40921a85a..4d5a0a98a08e 100644
=C2=A0 =C2=A0 --- a/stand/i386/loader/main.c
=C2=A0 =C2=A0 +++ b/stand/i386/loader/main.c
=C2=A0 =C2=A0 @@ -387,7 +387,7 @@ extract_currdev(void)

=C2=A0 =C2=A0 =C2=A0#ifdef LOADER_ZFS_SUPPORT
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (new_currdev.dd.d_dev->dv_type =3D=3D DEV= T_ZFS)
=C2=A0 =C2=A0 -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0init_zfs_boot_optio= ns(zfs_fmtdev(&new_currdev));
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0init_zfs_boot_optio= ns(zfs_fmtdev(&new_currdev.dd));
=C2=A0 =C2=A0 =C2=A0#endif

=C2=A0 =C2=A0 =C2=A0 =C2=A0 env_setenv("currdev", EV_VOLATILE, i3= 86_fmtdev(&new_currdev),
=C2=A0 =C2=A0 diff --git a/stand/i386/zfsboot/zfsboot.c b/stand/i386/zfsboo= t/zfsboot.c
=C2=A0 =C2=A0 index b68d80e802c2..52fd41688a17 100644
=C2=A0 =C2=A0 --- a/stand/i386/zfsboot/zfsboot.c
=C2=A0 =C2=A0 +++ b/stand/i386/zfsboot/zfsboot.c
=C2=A0 =C2=A0 @@ -226,7 +226,7 @@ main(void)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*/
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (bdev !=3D NULL && bdev->dd.d_dev= ->dv_type =3D=3D DEVT_ZFS) {
=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 */
=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));
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0strncpy(boot_devnam= e, zfs_fmtdev(&bdev->dd), sizeof (boot_devname));
=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,
=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) {
=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;
=C2=A0 =C2=A0 diff --git a/stand/libsa/zfs/devicename_stubs.c b/stand/libsa= /zfs/devicename_stubs.c
=C2=A0 =C2=A0 index 41bf907e0cf1..e58bc9c40e35 100644
=C2=A0 =C2=A0 --- a/stand/libsa/zfs/devicename_stubs.c
=C2=A0 =C2=A0 +++ b/stand/libsa/zfs/devicename_stubs.c
=C2=A0 =C2=A0 @@ -39,7 +39,7 @@ zfs_parsedev(struct zfs_devdesc *dev, const= char *devspec, const char **path)

=C2=A0 =C2=A0 =C2=A0__attribute__((weak))
=C2=A0 =C2=A0 =C2=A0char *
=C2=A0 =C2=A0 -zfs_fmtdev(void *vdev)
=C2=A0 =C2=A0 +zfs_fmtdev(struct devdesc *vdev)
=C2=A0 =C2=A0 =C2=A0{
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0static char=C2=A0 =C2=A0 buf[128];

=C2=A0 =C2=A0 diff --git a/stand/libsa/zfs/libzfs.h b/stand/libsa/zfs/libzf= s.h
=C2=A0 =C2=A0 index e8676c0d53b8..2f0dfd8afc86 100644
=C2=A0 =C2=A0 --- a/stand/libsa/zfs/libzfs.h
=C2=A0 =C2=A0 +++ b/stand/libsa/zfs/libzfs.h
=C2=A0 =C2=A0 @@ -50,7 +50,7 @@ struct zfs_devdesc {

=C2=A0 =C2=A0 =C2=A0int=C2=A0 =C2=A0 =C2=A0 =C2=A0 zfs_parsedev(struct zfs_= devdesc *dev, const char *devspec,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0const char **path);
=C2=A0 =C2=A0 -char=C2=A0 =C2=A0 =C2=A0 =C2=A0*zfs_fmtdev(void *vdev);
=C2=A0 =C2=A0 +char=C2=A0 =C2=A0 =C2=A0 =C2=A0*zfs_fmtdev(struct devdesc *)= ;
=C2=A0 =C2=A0 =C2=A0int=C2=A0 =C2=A0 =C2=A0 =C2=A0 zfs_probe_dev(const char= *devname, uint64_t *pool_guid);
=C2=A0 =C2=A0 =C2=A0int=C2=A0 =C2=A0 =C2=A0 =C2=A0 zfs_list(const char *nam= e);
=C2=A0 =C2=A0 =C2=A0int=C2=A0 =C2=A0 =C2=A0 =C2=A0 zfs_get_bootonce(void *,= const char *, char *, size_t);
=C2=A0 =C2=A0 diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c =C2=A0 =C2=A0 index 71e3a49c2929..5392bcaa4fb1 100644
=C2=A0 =C2=A0 --- a/stand/libsa/zfs/zfs.c
=C2=A0 =C2=A0 +++ b/stand/libsa/zfs/zfs.c
=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;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 /* This device is not set as currdev, mount us = private copy. */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (mount =3D=3D NULL)
=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 **)&mount);
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rv =3D zfs_mount(zf= s_fmtdev(&dev->dd), NULL, (void **)&mount);

=C2=A0 =C2=A0 =C2=A0 =C2=A0 if (rv =3D=3D 0) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 f->f_devdata =3D= mount;
=C2=A0 =C2=A0 @@ -1681,7 +1681,7 @@ zfs_parsedev(struct zfs_devdesc *dev, c= onst char *devspec, const char **path)
=C2=A0 =C2=A0 =C2=A0}

=C2=A0 =C2=A0 =C2=A0char *
=C2=A0 =C2=A0 -zfs_fmtdev(void *vdev)
=C2=A0 =C2=A0 +zfs_fmtdev(struct devdesc *vdev)
=C2=A0 =C2=A0 =C2=A0{
=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];
=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];
=C2=A0 =C2=A0 @@ -1689,7 +1689,7 @@ zfs_fmtdev(void *vdev)
=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;

=C2=A0 =C2=A0 =C2=A0 =C2=A0 buf[0] =3D '\0';
=C2=A0 =C2=A0 -=C2=A0 =C2=A0if (dev->dd.d_dev->dv_type !=3D DEVT_ZFS)=
=C2=A0 =C2=A0 +=C2=A0 =C2=A0if (vdev->d_dev->dv_type !=3D DEVT_ZFS) =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 return (buf);

=C2=A0 =C2=A0 =C2=A0 =C2=A0 /* Do we have any pools? */
=C2=A0 =C2=A0 diff --git a/stand/userboot/userboot/main.c b/stand/userboot/= userboot/main.c
=C2=A0 =C2=A0 index 07630945cf80..d3f12ab1675e 100644
=C2=A0 =C2=A0 --- a/stand/userboot/userboot/main.c
=C2=A0 =C2=A0 +++ b/stand/userboot/userboot/main.c
=C2=A0 =C2=A0 @@ -260,7 +260,7 @@ extract_currdev(void)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 bzero(&zdev, si= zeof(zdev));
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 zdev.dd.d_dev =3D &= amp;zfs_dev;

=C2=A0 =C2=A0 -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0init_zfs_boot_optio= ns(zfs_fmtdev(&zdev));
=C2=A0 =C2=A0 +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0init_zfs_boot_optio= ns(zfs_fmtdev(&zdev.dd));
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 dd =3D &zdev.dd= ;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 } else
=C2=A0 =C2=A0 =C2=A0#endif


--0000000000006b7e5305e5ffe167--