From nobody Sat Dec 28 18:01:16 2024 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 4YL9Cd0qhQz5hyXP; Sat, 28 Dec 2024 18:01:17 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YL9Cc6v4fz4sPh; Sat, 28 Dec 2024 18:01:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408877; 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=j3zTFPeu7utcDaZpPJr9euqvqleIUuXO2Af7pCstRqM=; b=fmzFRgjMKY+sjd+O9Lx85hcfctjjvg4tfUKBoXElSzWXn4bgYc6egAdbatnUTYnG23O3Ht clC2HspSHDeDE1U/yimxiJziXzY/TpUGzs6h9S2h0bUxq7nJILgCy7x/mVRLXvBmiGhql0 P2n6fhllfCQ4fUW7mWdORB9G9a9q3/BQ2IquWGM8LMZFJqtDzsFe1NkwxH0defhplXj2Ka WOyHXeksKhGUiZebE/zRMXWNx6dhBIJNx9XMgg4Vn7M1shrUUokgwmau44+NyqdrJBTFWS Niikrq3HRqxWqLAAe/vElRNWYepWjAFVSxSgB15LhNurUwPtl8IGNZ2Wyod9Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735408877; 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=j3zTFPeu7utcDaZpPJr9euqvqleIUuXO2Af7pCstRqM=; b=FVoVov051L+JyErPCsKTqf6MQuA31uetiA4aS3SE0f/Z9tqAGrnrf5wKX4Warx9jF9qVSh kVBNLzqjorxZGUOQEwv9LGxH4tQe1wUxaJYLLZKeg98ufbuM9S94dDev/t1oTLsKY6o0OK E03zGOSC1+lGVGqAUM/bxKQxRAxhljTibn/+GLLd4hrHDeXzeFqo5bqRSGPEaw2O0OUbQL oLDP3dwc+26RABqRPrBUMbElHqctN/cOuT0GvvisgztZkVFrrCdtrG30PhkOEmtSxH9sx/ y8J+KxhYMFyzVSS3/ZuWAEHcNDb8cSHQCXMiZ6sR0bc122/pW3eo01tI3cp/Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735408877; a=rsa-sha256; cv=none; b=FE9mnAnWKkL3yqd10cIgyzKDGvlO8nSV5EavC61nS9QNb0Cjj0bi9rzVzwN/K1ORr+WZJz Nc/mqa6RowGxgVjxya8WlH3KJ7//G0z+8MY5bx9FGJorBdop5aTmqtcNCVZ0C+oNrv9pnQ eLQjmp3IugA2deb8OJnEM0uREnedDgtJE+F2re9I65F6vaIwS1rSsoWR++CppReoVEY3lH ome2AbdXKaQkYbOnbdPFES3ljsUqeXMRyEIjLfYZPFHHRDL0xUe22Ip3E0YBzvPSLgk8IP +Qbp7oxBfm2eBWXQ8XYxzuy9VvV90tPyuaLiZXkviccbJf54HFaQyQoDfML7tA== 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 4YL9Cc6VpKzbBV; Sat, 28 Dec 2024 18:01:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BSI1GY3038347; Sat, 28 Dec 2024 18:01:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BSI1GAA038344; Sat, 28 Dec 2024 18:01:16 GMT (envelope-from git) Date: Sat, 28 Dec 2024 18:01:16 GMT Message-Id: <202412281801.4BSI1GAA038344@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: 3c7f629b3819 - stable/13 - ata_xpt: Rename probe_softc to aprobe_softc 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 3c7f629b38194920c0a1c71a42bc9d7321d335d7 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3c7f629b38194920c0a1c71a42bc9d7321d335d7 commit 3c7f629b38194920c0a1c71a42bc9d7321d335d7 Author: Warner Losh AuthorDate: 2024-12-28 17:59:59 +0000 Commit: Warner Losh CommitDate: 2024-12-28 18:00:53 +0000 ata_xpt: Rename probe_softc to aprobe_softc Since both scsi_xpt and ata_xpt use the same name for the softc, this can lead to problems in gdb. Avoid the issue by renaming the ata probe_softc to aprobe_softc as has been done for the aprobe in 0f280cbd0a3a9. This was overlooked at the time. Sponsored by: Netflix MFC After: 2 weeks (cherry picked from commit 4762aa57ad17b67b46570025ca21ac4a5eefed0c) --- sys/cam/ata/ata_xpt.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index 5c239b576416..5c8f07dd5e9e 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -146,7 +146,7 @@ typedef struct { int faults; u_int caps; struct cam_periph *periph; -} probe_softc; +} aprobe_softc; static struct ata_quirk_entry ata_quirk_table[] = { @@ -276,7 +276,7 @@ static cam_status aproberegister(struct cam_periph *periph, void *arg) { union ccb *request_ccb; /* CCB representing the probe request */ - probe_softc *softc; + aprobe_softc *softc; request_ccb = (union ccb *)arg; if (request_ccb == NULL) { @@ -285,7 +285,7 @@ aproberegister(struct cam_periph *periph, void *arg) return(CAM_REQ_CMP_ERR); } - softc = (probe_softc *)malloc(sizeof(*softc), M_CAMXPT, M_ZERO | M_NOWAIT); + softc = (aprobe_softc *)malloc(sizeof(*softc), M_CAMXPT, M_ZERO | M_NOWAIT); if (softc == NULL) { printf("proberegister: Unable to probe new device. " @@ -312,9 +312,9 @@ static void aprobeschedule(struct cam_periph *periph) { union ccb *ccb; - probe_softc *softc; + aprobe_softc *softc; - softc = (probe_softc *)periph->softc; + softc = (aprobe_softc *)periph->softc; ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs); if ((periph->path->device->flags & CAM_DEV_UNCONFIGURED) || @@ -338,14 +338,14 @@ aprobestart(struct cam_periph *periph, union ccb *start_ccb) struct ccb_trans_settings cts; struct ccb_ataio *ataio; struct ccb_scsiio *csio; - probe_softc *softc; + aprobe_softc *softc; struct cam_path *path; struct ata_params *ident_buf; u_int oif; CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("aprobestart\n")); - softc = (probe_softc *)periph->softc; + softc = (aprobe_softc *)periph->softc; path = start_ccb->ccb_h.path; ataio = &start_ccb->ataio; csio = &start_ccb->csio; @@ -742,7 +742,7 @@ aprobedone(struct cam_periph *periph, union ccb *done_ccb) struct ccb_trans_settings cts; struct ata_params *ident_buf; struct scsi_inquiry_data *inq_buf; - probe_softc *softc; + aprobe_softc *softc; struct cam_path *path; cam_status status; u_int32_t priority; @@ -754,7 +754,7 @@ aprobedone(struct cam_periph *periph, union ccb *done_ccb) CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("aprobedone\n")); - softc = (probe_softc *)periph->softc; + softc = (aprobe_softc *)periph->softc; path = done_ccb->ccb_h.path; priority = done_ccb->ccb_h.pinfo.priority; ident_buf = &path->device->ident_data; @@ -1602,9 +1602,9 @@ ata_scan_lun(struct cam_periph *periph, struct cam_path *path, xpt_path_lock(path); if ((old_periph = cam_periph_find(path, "aprobe")) != NULL) { if ((old_periph->flags & CAM_PERIPH_INVALID) == 0) { - probe_softc *softc; + aprobe_softc *softc; - softc = (probe_softc *)old_periph->softc; + softc = (aprobe_softc *)old_periph->softc; TAILQ_INSERT_TAIL(&softc->request_ccbs, &request_ccb->ccb_h, periph_links.tqe); softc->restart = 1;