From nobody Thu Jan 8 06:24:36 2026 X-Original-To: dev-commits-src-main@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 4dmvyF3hw9z5hsfV for ; Thu, 08 Jan 2026 06:24:37 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dmvyD5cVKz3SCV for ; Thu, 08 Jan 2026 06:24:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767853476; 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=SHtjX05Mgin1bg7VmlENpy3lCiWnUxzeroKglIsTals=; b=fi86m71xX/aWkNbnCuYlamtqoonTL9r+0Xk2bj2HOUPTSEJe8+xDz44UJi8xXeVPYCt/5w 4FoBI117SnTCGPIz+xClzZwufSgy1Xp0HMjCe1hxB9Zem0N4GwyHrT2GYeoqcN6QiPCqte vx7cqPXBZDzY7toeoeGLmWJxQSZ3p9fx0VO7e1dVkgl3K6NBSbQBnw7AyrwxEMJKktSpYx 3VU7Pmc7sg0RoN1N5YWYjhm8QVukPGBlCZHBT18VNnsudMuXS0g61gJK+auHGTJX8Ahmrr pqBBjypHA+XKCfwQf0/sIX+4d/KfnextdxOMXm723AgY0zgCBZlHIoPB7CGQcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767853476; 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=SHtjX05Mgin1bg7VmlENpy3lCiWnUxzeroKglIsTals=; b=hnAJS3W815LMA32IotcdRJc6/4/mThHDzXSwYDcJsmHJ4JzZmE+ydsWM0HtWzb5RNYvfi0 eRb+/TlitKkukDgwT/BgP+n6nZP2sG6gOyuRwlfK04DkrOiB83DT67QKJQG3+4TWkrj4bd b/RbA+q3B3nME6iKdl9WlScw2QcCRnC339YzqexPJ0JAlcUMfk7MIh3BlTQev2FMMGwhVc LYHpQKS/3FFWmmp4UrVVTfGOtPXaDQJdXpGpqFBH6Ik1CWxVTLUDT8My94uxPfzH6cv0/a cWSLFFit6ie7aRgbHtTvpnbWrrWrRNUCLSg9oVP7NsaPVE3cEZqCFpM0ltodXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767853476; a=rsa-sha256; cv=none; b=QyTec90UUL92u2zAIAhnjEGcv5fu11RXrX4ePaus70RSlnUR/z7o4DPfecPu6K9wAGYua9 tVRZ3GDW5ChrIPl44z9kaVx5PGO6zuBd3G9RGHoQdnU7EIkzwFujAU7EMwKHxzrlWfgt/j 7fkQY37Mz2BshwR0cNmR5XKVO8hzRrhfNDlrWuBRxM35cgSeiKwUpKHUGp2G3DDtfM5HyC 8UvQbVkEpoygEy/zpSKY9Q+9S+KS27mzpI8AbaHqYvWr8zc8+oMm97edSzZ37cSm0Royz4 updVNkjvkcwUvxc1MlvgI1M3z4JWuDm4/Nv+Lnli3jB3Cu0Yh0DdEOWDqmPmHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dmvyD36jXzBrj for ; Thu, 08 Jan 2026 06:24:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38be1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Jan 2026 06:24:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: aaec2a90b5ce - main - cam: When inq data isn't valid, pass NULL List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: aaec2a90b5cecd38520ecb0ffa23f116d36933f3 Auto-Submitted: auto-generated Date: Thu, 08 Jan 2026 06:24:36 +0000 Message-Id: <695f4da4.38be1.3f82b91@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=aaec2a90b5cecd38520ecb0ffa23f116d36933f3 commit aaec2a90b5cecd38520ecb0ffa23f116d36933f3 Author: Warner Losh AuthorDate: 2026-01-08 06:19:21 +0000 Commit: Warner Losh CommitDate: 2026-01-08 06:19:21 +0000 cam: When inq data isn't valid, pass NULL When the device isn't there, we don't have valid inq data. Pass NULL in this case. All the routines that receive this test against NULL already. Sponsored by: Netflix Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D54470 --- sys/cam/scsi/scsi_all.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c index 4ea2ab7d4acd..d8bba97e79bc 100644 --- a/sys/cam/scsi/scsi_all.c +++ b/sys/cam/scsi/scsi_all.c @@ -3711,13 +3711,12 @@ scsi_command_string(struct cam_device *device, struct ccb_scsiio *csio, xpt_gdev_type(cgd, csio->ccb_h.path); /* - * If the device is unconfigured, just pretend that it is a hard - * drive. scsi_op_desc() needs this. + * If the device is unconfigured, the inq data is invalid. */ if (cgd->ccb_h.status == CAM_DEV_NOT_THERE) - cgd->inq_data.device = T_DIRECT; - - inq_data = &cgd->inq_data; + inq_data = NULL; + else + inq_data = &cgd->inq_data; #else /* !_KERNEL */ @@ -5170,13 +5169,12 @@ scsi_sense_sbuf(struct cam_device *device, struct ccb_scsiio *csio, xpt_gdev_type(cgd, csio->ccb_h.path); /* - * If the device is unconfigured, just pretend that it is a hard - * drive. scsi_op_desc() needs this. + * If the device is unconfigured, the inq data is invalid. */ if (cgd->ccb_h.status == CAM_DEV_NOT_THERE) - cgd->inq_data.device = T_DIRECT; - - inq_data = &cgd->inq_data; + inq_data = NULL; + else + inq_data = &cgd->inq_data; #else /* !_KERNEL */