From nobody Tue Jan 24 22:11:59 2023 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 4P1h5r23s8z3bfjC; Tue, 24 Jan 2023 22:12:00 +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 4P1h5r0tBZz4QBF; Tue, 24 Jan 2023 22:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598320; 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=ZNIrNoYeXqKT92akC4M7PaFh/zBAuPQp3047Mg4Mt8c=; b=KcKyKE3dG1BeiJ2NxRDYNb+reY5+ujOQkqM2IxGnsTw8ZLjMAo8eIoUPT87acGYB9BfeM8 UtN8x3ijyAmWeikZ8Czu/7hBdE5kl84oMhd2EqMc2k3q5LJZh9j6CD3LtNMdmUczSAKaer FwGl0pw3o48GP+saAuvBwqkaNmg7W4vLOAOTNR9LusoIH/9XQwJqcxidaTRQ3j01yVRGKo Bc2p2m8ZZZ+c+iiZEQzlD7y7jxw9FGAJyCQks2V7If8AtuxVt89a+aidQ1C0K174IX3ZUM WbVVaPuK9kK9y4c8wFJit2JArWBnRFMj/fc8k2hq/pvbi8t2RtRCgPfQJxtc2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598320; 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=ZNIrNoYeXqKT92akC4M7PaFh/zBAuPQp3047Mg4Mt8c=; b=mHOkGuVWZw4fiOMR5OVjJh9vyoXS2Jh+WxoXzcrbOtuSRXlyIuYfkXpSPNwyLHGxfX/Lze +Q7auJawxVYMMkoNquffa37UpQ8Lsm2pDaFfL+jmz0lUshfffKuA4YTFue9O/R3lC/HAt/ stO0UUNg1YekRQltJwVkcsfwxf5CpNo16KLWZ2vJPPos3qBEeoD2ZHvJ4zv/DjxgSBKIka zJMJ6Tng4HpiUBD+Rc2WSjTxx2FNL2AzZZNUKWqa8UV9JtHp0y7kcLDFpTaRm5BdDWXKtB rM4/Zxhat/DoSq+LWVAECkXhpFziqQ6+XeSeqEaDrIkRIG0xUd0zIIA37fsZ+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598320; a=rsa-sha256; cv=none; b=BG/n6Y9VkecaVZBu4L3FF2UXmemLPn+5QeTf+ZORc4TLO9GY3uYREhIuZwlfYvaUzA+1hn t+uHxYeuSlsemjtBPQP5p0sHj7wyJJh2MTs7NlVWGS5tyfqUkLnrqAnQx58TB8wfvfY9ON 1PWyahnJadYGRXTHzMsQ18KOTecXT59RqFPzTyvGBkN8fRVigXFHjOO/ufKTbJMIpWQZFY qKe6+KfdtqxiFtCFHPhoqNz/FV4yQ9s5vcvLjlMT2eVfdS/iBZr4hiDUvQUQln2ypzx9m2 WdjrADzKoy3vHnlsNXraIaIocAVf5KX/aZaCRdvwvFd6wTNGBY+h8cm41l8t8A== 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 4P1h5q6XZczQcH; Tue, 24 Jan 2023 22:11:59 +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 30OMBx4V085477; Tue, 24 Jan 2023 22:11:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMBxor085476; Tue, 24 Jan 2023 22:11:59 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:11:59 GMT Message-Id: <202301242211.30OMBxor085476@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: ec6d9023e56a - stable/13 - stand: Use devformat instead of disk_devfmt 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 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: ec6d9023e56aebe0c3fe8fb7d15512097a20df8a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ec6d9023e56aebe0c3fe8fb7d15512097a20df8a commit ec6d9023e56aebe0c3fe8fb7d15512097a20df8a Author: Warner Losh AuthorDate: 2022-08-11 15:07:13 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:30 +0000 stand: Use devformat instead of disk_devfmt Use devformat instead of disk_devfmt. This allows us to avoid knowing the details of the device that's underneath us. Remove disk.h include and the -I${LDRSRC} from the build of ufs.c since they are no longer needed. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D35922 [ minor tweaks due to earlier UFS MFC ] (cherry picked from commit 0b3a4a588fb6b30d923686828dab4685b94ec1ea) --- stand/libsa/ufs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/stand/libsa/ufs.c b/stand/libsa/ufs.c index fa3820617860..8385a1a3419d 100644 --- a/stand/libsa/ufs.c +++ b/stand/libsa/ufs.c @@ -81,7 +81,6 @@ __FBSDID("$FreeBSD$"); #include #include #include "stand.h" -#include "disk.h" #include "string.h" static int ufs_open(const char *path, struct open_file *f); @@ -525,7 +524,7 @@ ufs_open(const char *upath, struct open_file *f) return (errno); f->f_fsdata = (void *)fp; - dev = disk_fmtdev(f->f_devdata); + dev = devformat((struct devdesc *)f->f_devdata); /* Is this device mounted? */ STAILQ_FOREACH(mnt, &mnt_list, um_link) { if (strcmp(dev, mnt->um_dev) == 0) @@ -744,7 +743,7 @@ ufs_close(struct open_file *f) } free(fp->f_buf); - dev = disk_fmtdev(f->f_devdata); + dev = devformat((struct devdesc *)f->f_devdata); STAILQ_FOREACH(mnt, &mnt_list, um_link) { if (strcmp(dev, mnt->um_dev) == 0) break;