From nobody Tue Jan 24 22:12:02 2023 X-Original-To: dev-commits-src-branches@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 4P1h5t4C4Jz3bfYh; Tue, 24 Jan 2023 22:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1h5t2vCLz4QNN; Tue, 24 Jan 2023 22:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4gypo8ytSyTWbgWEWLMuclItwpNJvGDntl1ZJ5BdkhI=; b=Y+YjAHxBufo588bIMrk1ZCdUHTHvUrhpybw5jK2MJURrCYnUO6mS7df+iMHXqueNq4lpL5 szi5CSTKmrhrCrZoL8hLOwulh/dIRZwV4W7EaQtNE0ZLG6NxhQiUwVdVK76I86HIl9AMa1 8YSUM2+NPbSg8SOxrcexDeTRLwJP/wBw/qqKZ69d/X7tVjzHdOilIOp2G1YNE+FDoVIjqc bGg1dkzuALoHsYkgxecE8wrNu6rQM7x8egcrlALMtEAS3ATBLjDP8HHUGEkv3tlgkUhVfX MVdc0E0I7d2Tayf3D9txJdUwJ8N2hKETANN0+NeXPBrxYs5ipN8Qr2Zk/Jd8Kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4gypo8ytSyTWbgWEWLMuclItwpNJvGDntl1ZJ5BdkhI=; b=rLOFeHkeRvUVHFvDv/1OjLV3zpR2NuoYPkjddNsuUmSfedHoMcoi4+kjM/+nsVbl4iv+u0 FUcVQueryeGkAsQ6mMtSAIyLGBxd2BUL+Crfvm1u73E9r/MUG5gU7d6w39vIMP7poqBrCm +zLteHz7AoJvkCLOZZB70Ya/W1QlLAnGNMne4QB+V3l0/7gK0WusMIn4dY8cyn2kEflgTR hd/r5Ho3/4ovPituQDPJjDSNNqNYu76kGrcDR9s7nJB7OjzLpkbNV9eXLO1d6fjhwaYc9Q YYZpfVWKyxaIQTv1EegHfgHVQNVbbMbft9GsFtUxqgg7nhlHSTnDkRl3LL39Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598322; a=rsa-sha256; cv=none; b=dMDMvbzRNls5Rw1OM1S5+TKpmn3Uxg51TPWvs1/8j1Ivcuz5R9E6JFaYww+FEraO5rwsmN 16rBozyOB7cmJvllopZEI3vDldutxQiOwtKtWo5T/llbbzPadJb6h7IL3wYEnVsHnsTFS5 /dF4Hf7yz4E2YXS2Q+ppWK1f06eILSf2cY9833Yx6AaRVSnh/or9BIMkNMyySRLAv7zawN l9OJ0rwj9f82je834Vnwwo95w++iJQsvoTv6PTBFKN4qSzmMKGsbR/wlEPvIhogBh8hIvU MAnmjjDuw1wLOa9tDWbPMDrxPrnQ7SmhchnJFgMv7nwZgdBsB9kD/Dbi6lylvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1h5t1DTKzQPM; Tue, 24 Jan 2023 22:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OMC2oZ085526; Tue, 24 Jan 2023 22:12:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMC2kF085525; Tue, 24 Jan 2023 22:12:02 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:02 GMT Message-Id: <202301242212.30OMC2kF085525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: e9db6f25b5a6 - stable/13 - stand: Replace zfs_fmtdev with generic devformat() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e9db6f25b5a6bb9ca76351c88720cca2ffcb6604 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e9db6f25b5a6bb9ca76351c88720cca2ffcb6604 commit e9db6f25b5a6bb9ca76351c88720cca2ffcb6604 Author: Warner Losh AuthorDate: 2022-08-11 15:07:44 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:31 +0000 stand: Replace zfs_fmtdev with generic devformat() Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D35973 (cherry picked from commit edb26097cb6416adb89b54c830d36c0ead3ca64c) --- stand/i386/loader/main.c | 2 +- stand/i386/zfsboot/zfsboot.c | 4 ++-- stand/libsa/zfs/zfs.c | 2 +- stand/userboot/userboot/main.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c index 4d5a0a98a08e..c15c97c961b7 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.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 index 52fd41688a17..930a6fb530af 100644 --- a/stand/i386/zfsboot/zfsboot.c +++ b/stand/i386/zfsboot/zfsboot.c @@ -222,11 +222,11 @@ main(void) 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 index 0ac67d750fcd..b525858ffc3c 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->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 index d3f12ab1675e..d323d1f9789b 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.dd)); + init_zfs_boot_options(devformat(&zdev.dd)); dd = &zdev.dd; } else #endif