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
[-- Attachment #1 --] 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 > > > [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Aug 11, 2022 at 5:47 PM Ravi Pokala <<a href="mailto:rpokala@freebsd.org">rpokala@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">-----Original Message-----<br> From: <<a href="mailto:owner-src-committers@freebsd.org" target="_blank">owner-src-committers@freebsd.org</a>> on behalf of Warner Losh <imp@FreeBSD.org><br> Date: 2022-08-11, Thursday at 09:27<br> To: <src-committers@FreeBSD.org>, <dev-commits-src-all@FreeBSD.org>, <dev-commits-src-main@FreeBSD.org><br> Subject: git: d2d4e1271b33 - main - stand: Change zfs_fmtdev to take a struct devdesc *<br> <br> The branch main has been updated by imp:<br> <br> URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=d2d4e1271b33b233f57fd18a61a1b5c1b0aeb355" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=d2d4e1271b33b233f57fd18a61a1b5c1b0aeb355</a><br>; <br> commit d2d4e1271b33b233f57fd18a61a1b5c1b0aeb355<br> Author: Warner Losh <imp@FreeBSD.org><br> AuthorDate: 2022-08-11 15:05:15 +0000<br> Commit: Warner Losh <imp@FreeBSD.org><br> CommitDate: 2022-08-11 16:27:15 +0000<br> <br> stand: Change zfs_fmtdev to take a struct devdesc *<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't</div><div>put that reason in each and every commit message.</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> Also, shouldn't the other places in zfs_fmtdev() that use 'dev->dd.' be updated to use 'vdev->'?<br></blockquote><div><br></div><div>I believe I updated everything that should be updated. But if I've missed something, I'm happy to discuss it.</div><div><br></div><div>Warner</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> Thanks,<br> <br> Ravi (rpokala@)<br> <br> Sponsored by: Netflix<br> Differential Revision: <a href="https://reviews.freebsd.org/D35974" rel="noreferrer" target="_blank">https://reviews.freebsd.org/D35974</a><br>; ---<br> stand/i386/loader/main.c | 2 +-<br> stand/i386/zfsboot/zfsboot.c | 2 +-<br> stand/libsa/zfs/devicename_stubs.c | 2 +-<br> stand/libsa/zfs/libzfs.h | 2 +-<br> stand/libsa/zfs/zfs.c | 6 +++---<br> stand/userboot/userboot/main.c | 2 +-<br> 6 files changed, 8 insertions(+), 8 deletions(-)<br> <br> diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c<br> index 29c40921a85a..4d5a0a98a08e 100644<br> --- a/stand/i386/loader/main.c<br> +++ b/stand/i386/loader/main.c<br> @@ -387,7 +387,7 @@ extract_currdev(void)<br> <br> #ifdef LOADER_ZFS_SUPPORT<br> if (new_currdev.dd.d_dev->dv_type == DEVT_ZFS)<br> - init_zfs_boot_options(zfs_fmtdev(&new_currdev));<br> + init_zfs_boot_options(zfs_fmtdev(&new_currdev.dd));<br> #endif<br> <br> env_setenv("currdev", EV_VOLATILE, i386_fmtdev(&new_currdev),<br> diff --git a/stand/i386/zfsboot/zfsboot.c b/stand/i386/zfsboot/zfsboot.c<br> index b68d80e802c2..52fd41688a17 100644<br> --- a/stand/i386/zfsboot/zfsboot.c<br> +++ b/stand/i386/zfsboot/zfsboot.c<br> @@ -226,7 +226,7 @@ main(void)<br> */<br> if (bdev != NULL && bdev->dd.d_dev->dv_type == DEVT_ZFS) {<br> /* set up proper device name string for ZFS */<br> - strncpy(boot_devname, zfs_fmtdev(bdev), sizeof (boot_devname));<br> + strncpy(boot_devname, zfs_fmtdev(&bdev->dd), sizeof (boot_devname));<br> if (zfs_get_bootonce(bdev, OS_BOOTONCE, cmd,<br> sizeof(cmd)) == 0) {<br> nvlist_t *benv;<br> diff --git a/stand/libsa/zfs/devicename_stubs.c b/stand/libsa/zfs/devicename_stubs.c<br> index 41bf907e0cf1..e58bc9c40e35 100644<br> --- a/stand/libsa/zfs/devicename_stubs.c<br> +++ b/stand/libsa/zfs/devicename_stubs.c<br> @@ -39,7 +39,7 @@ zfs_parsedev(struct zfs_devdesc *dev, const char *devspec, const char **path)<br> <br> __attribute__((weak))<br> char *<br> -zfs_fmtdev(void *vdev)<br> +zfs_fmtdev(struct devdesc *vdev)<br> {<br> static char buf[128];<br> <br> diff --git a/stand/libsa/zfs/libzfs.h b/stand/libsa/zfs/libzfs.h<br> index e8676c0d53b8..2f0dfd8afc86 100644<br> --- a/stand/libsa/zfs/libzfs.h<br> +++ b/stand/libsa/zfs/libzfs.h<br> @@ -50,7 +50,7 @@ struct zfs_devdesc {<br> <br> int zfs_parsedev(struct zfs_devdesc *dev, const char *devspec,<br> const char **path);<br> -char *zfs_fmtdev(void *vdev);<br> +char *zfs_fmtdev(struct devdesc *);<br> int zfs_probe_dev(const char *devname, uint64_t *pool_guid);<br> int zfs_list(const char *name);<br> int zfs_get_bootonce(void *, const char *, char *, size_t);<br> diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c<br> index 71e3a49c2929..5392bcaa4fb1 100644<br> --- a/stand/libsa/zfs/zfs.c<br> +++ b/stand/libsa/zfs/zfs.c<br> @@ -1583,7 +1583,7 @@ zfs_dev_open(struct open_file *f, ...)<br> rv = 0;<br> /* This device is not set as currdev, mount us private copy. */<br> if (mount == NULL)<br> - rv = zfs_mount(zfs_fmtdev(dev), NULL, (void **)&mount);<br> + rv = zfs_mount(zfs_fmtdev(&dev->dd), NULL, (void **)&mount);<br> <br> if (rv == 0) {<br> f->f_devdata = mount;<br> @@ -1681,7 +1681,7 @@ zfs_parsedev(struct zfs_devdesc *dev, const char *devspec, const char **path)<br> }<br> <br> char *<br> -zfs_fmtdev(void *vdev)<br> +zfs_fmtdev(struct devdesc *vdev)<br> {<br> static char rootname[ZFS_MAXNAMELEN];<br> static char buf[2 * ZFS_MAXNAMELEN + 8];<br> @@ -1689,7 +1689,7 @@ zfs_fmtdev(void *vdev)<br> spa_t *spa;<br> <br> buf[0] = '\0';<br> - if (dev->dd.d_dev->dv_type != DEVT_ZFS)<br> + if (vdev->d_dev->dv_type != DEVT_ZFS)<br> return (buf);<br> <br> /* Do we have any pools? */<br> diff --git a/stand/userboot/userboot/main.c b/stand/userboot/userboot/main.c<br> index 07630945cf80..d3f12ab1675e 100644<br> --- a/stand/userboot/userboot/main.c<br> +++ b/stand/userboot/userboot/main.c<br> @@ -260,7 +260,7 @@ extract_currdev(void)<br> bzero(&zdev, sizeof(zdev));<br> zdev.dd.d_dev = &zfs_dev;<br> <br> - init_zfs_boot_options(zfs_fmtdev(&zdev));<br> + init_zfs_boot_options(zfs_fmtdev(&zdev.dd));<br> dd = &zdev.dd;<br> } else<br> #endif<br> <br> <br> </blockquote></div></div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfq0_h-9Onyc_AfH5BT9Uo7TR=7DRQk0_i0MwpTri=dVbQ>