From nobody Sat Jan 15 00:21:09 2022 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 9A082195C291; Sat, 15 Jan 2022 00:21:10 +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 4JbJjy0hHtz4TwB; Sat, 15 Jan 2022 00:21:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642206070; 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=nh+s6fKdHjVJeW1tVOhxd4xH+qSJqqf/8UFcEnZ+iUg=; b=qI6Dag64c6kCshO0FW56AB/+oa4BP3mSseyhEHyH4fNFx8heGMKmPaldq0N67YM0M/IZ0Z 1mq4NbWNwt3UCu/DoXP8b07qC//5t5kOUNtTGhZjRN5bgnfxEAlA30YfYoca3uFH5B8K40 O+X9YK+/q2NHG148DaMQudwN1jQZW0nDoRcql6o8TEhrALBUUQsWs+M3u9X/Or1YOnQS5L GPHgpt71uCMikli5wPZlw/5jm72G6r3Nk68KwkKXrSTjaEhC8oFnQwC91f15l5CLZ49Xnq 83bvBh8inxkyZ1pZ7YJJg3GbQJDKaCdgscrnhZH8QVV4DCrF8yDpbud29BUlMA== 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 D7DE21D5D4; Sat, 15 Jan 2022 00:21:09 +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 20F0L9ht089466; Sat, 15 Jan 2022 00:21:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20F0L9LH089465; Sat, 15 Jan 2022 00:21:09 GMT (envelope-from git) Date: Sat, 15 Jan 2022 00:21:09 GMT Message-Id: <202201150021.20F0L9LH089465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4762aa57ad17 - main - 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: 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/main X-Git-Reftype: branch X-Git-Commit: 4762aa57ad17b67b46570025ca21ac4a5eefed0c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642206070; 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=nh+s6fKdHjVJeW1tVOhxd4xH+qSJqqf/8UFcEnZ+iUg=; b=xfCPuujrcLs+nx0Id2r66fl0PdUlBUWMTopeZXrmDfpv+6FhT5c59XdIHUsyloN+vgdHMI 5XqT2GCzK1lCrYB0V647NWRQzI4/vuX9V9oQ8VjlyRrXjFcMjCuwGWc/dPNmt6BJgzHe/1 VbOmFpGvIMQ7d0zHXUoVz7jabEHgWyooYAwfv7rCGtbIGhPmgMfOdMa5XAXACcOVZBIdXl qXIOAyyc0nVtzrm3zw9ppivbrCWlbfYFtlpJ35F1feycsbc6FjAkBS9Exo58JdsyU5/hAR Tz9vAZgjLJUSJdieDfNEJ5BzlznrMq5UshpJ7R0AF3cfd/Lxam3NvgWbuFsukg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642206070; a=rsa-sha256; cv=none; b=suS53Td7n/6+k0rWTookeFuHTZneVZY1lN8SEAOiVgieiN5t7LddIFtXhBRnPtTMXitQEG jWHDigly/gjW4ki/oE4UuLyR2iq61JTOvtj/H5fCn4/3O3gPQGby+jOMbEoRcEKBsrRohU n0uWGfWFY0nv3Mg8mkmutHB/dhtemUixL63i86I2Q4QIXv1UbHUgkGwJek4U5fDdsSYlQo nxTAKpZOf9waGgYGOoBme4+m4uC4+S4UDUuQUNpkGBKiLre+Ap8Q+gIOTxgQheryv3ik1C SYek+2yxbBRK7zhRwOlrwo1sDyVa7U2wbqPMVXUzPVEd2n8HvXfn/f5dRzE99g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4762aa57ad17b67b46570025ca21ac4a5eefed0c commit 4762aa57ad17b67b46570025ca21ac4a5eefed0c Author: Warner Losh AuthorDate: 2022-01-15 00:21:09 +0000 Commit: Warner Losh CommitDate: 2022-01-15 00:21:09 +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 --- 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 ee0fe65e2ada..5d47f27e7779 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -148,7 +148,7 @@ typedef struct { int faults; u_int caps; struct cam_periph *periph; -} probe_softc; +} aprobe_softc; static struct ata_quirk_entry ata_quirk_table[] = { @@ -278,7 +278,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) { @@ -287,7 +287,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. " @@ -314,9 +314,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) || @@ -340,14 +340,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; @@ -745,7 +745,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; @@ -757,7 +757,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; @@ -1605,9 +1605,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;