From nobody Tue Jan 24 22:11:58 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 4P1h5q0mNFz3bfYY; Tue, 24 Jan 2023 22:11:59 +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 4P1h5p6f8gz4QGW; Tue, 24 Jan 2023 22:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598319; 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=OrLW32ZNeJVASH2ygOojKb5p/vR0ohHumZfgh/5tLuM=; b=Rw2B9haE0ExH6nZ7JI4Bdyfs8sWUqG5olOtFppQWSWrYEIy/5wM4qKgSL3ImviOUbUCSEp uQYZamqycKY+YOVMjy/SHG60A+cYuOQE7WuDybl8JzRdqGf/6Oc67ynY32/mMvUhZVOWGi ezy3Ant2O/FjeY7S1Cmn3Viwql0n43exjWzmAcKUuJjsmkcOwNXdJuRaPaWhG2R5BqyfE2 R2ocY/w9jj2oEK88j7cnkZx1m+at4gwSPW4e1ZY71ySCA3tgNIOmOEmgvVDncll7YgD4pW Eqk0LPjVaSFIbWAaikw6+o5W8hPgw0I9Oq0vXfAnslGQue0G0M6tYVni3Q4iNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598319; 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=OrLW32ZNeJVASH2ygOojKb5p/vR0ohHumZfgh/5tLuM=; b=x5MolhySPu3MsvQEFEEotYAWhAl7g1fbfC4FepmDUNTb7SExGiNAPMwgFlFgVgm6xVahxb ySAvvsx/u9CAqv5s5QX3hQbjH8HqL8DSAoHftHW/l04b36Y8aXCyALuNBWPf4oaHQOpZP8 iRT23MihU1BB3Q2FpiwsX5a2/M1XiUMVAI3Pfm9lgyhwfPXxp5ulbLULG/nDuRh47iR7Ys 8uEIK3CXNvlrYUd9cvq5oTSCifd7IddyGXCworCyIUCZ6J3tVsna9nPhzWLxAlvo2QJkqR tff8XbqzfXPSLlmtxhArLeYbu1vjOWYUVKsZMsp8Pw767HlgNlM8voOtE5gP3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598319; a=rsa-sha256; cv=none; b=iMVbsoa/Ap4wnVNBrKgPH8AeQSCi/Mcxy9PrMmioLuFPCdZgENO4Xyi5HBw5V8lNv6RClx MxQ2c6w4zmQ+ZZaMezOIyF1r3cOv8ceCjdvDB+luglrOzPriPgZtT1Jf7SI2/cQgK1TuoB CM0Y6gr4zzDnd07fWgzynbFwQcNEgKuMnHdo4MVVzVTMUukQD5FTQqXVC4IzHkKt71Y/J4 5p2xF/90mTzt0alfQhFKvnFgF81XRMWQeDap5phDv7ovAvQqzSQo2B4KuWWkYVTCLlJY57 hueTUdEGhtA6MjQ0C20VE0oqN+5j+74FSXyYwjgEhw7CdCd7Uh+mJ2dSkJwDiw== 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 4P1h5p5kZTzQf3; Tue, 24 Jan 2023 22:11:58 +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 30OMBwIk085453; Tue, 24 Jan 2023 22:11:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMBw4f085452; Tue, 24 Jan 2023 22:11:58 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:11:58 GMT Message-Id: <202301242211.30OMBw4f085452@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: fe9661bce6a4 - stable/13 - stand: Use devformat rather than disk_devfmt 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: fe9661bce6a4dcd9e99f13d28c973beba47efdee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fe9661bce6a4dcd9e99f13d28c973beba47efdee commit fe9661bce6a4dcd9e99f13d28c973beba47efdee Author: Warner Losh AuthorDate: 2022-08-11 15:06:53 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:30 +0000 stand: Use devformat rather than disk_devfmt Fix layering violation and use devformat to get the string representation of the device to see if we're mounted yet or not. Remove added include to pickup disk.h. Sponsored by: Netflix Reviewed by: tsoome (prior version) Differential Revision: https://reviews.freebsd.org/D35919 [ minor changes because UFS changes interferred and were already merged ] (cherry picked from commit ec9f3e776f39286ccec9915f38cca9729e6f9241) --- stand/libsa/dosfs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stand/libsa/dosfs.c b/stand/libsa/dosfs.c index b931648a364b..e50f8f25e16a 100644 --- a/stand/libsa/dosfs.c +++ b/stand/libsa/dosfs.c @@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$"); #include #include "stand.h" -#include "disk.h" #include "dosfs.h" @@ -314,7 +313,7 @@ dos_open(const char *path, struct open_file *fd) u_int size, clus; int err; - dev = disk_fmtdev(fd->f_devdata); + dev = devformat((struct devdesc *)fd->f_devdata); STAILQ_FOREACH(mnt, &mnt_list, dos_link) { if (strcmp(dev, mnt->dos_dev) == 0) break;