From nobody Fri Feb 9 15:41:24 2024 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 4TWdPK0L85z59tXp; Fri, 9 Feb 2024 15:41:25 +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 4TWdPJ6wDdz4KNZ; Fri, 9 Feb 2024 15:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707493285; 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=cSdJlAbnIROp5no2eleiX83S/1TFcZh/UNDvVyCAdc8=; b=yEqD3t30R31A8GODEr8Nl+YZtNKZ/gCcVfiHxcvNJYv9D2EmS/Ssp3kYqw4/cUWXV2CMmG OIHg/u36tZQQzm0aZbZtMFPlUYcG//A4ICG7bkCUopt0qJcC3KrRQ5XvlL6y/Py0NcJuY4 yjInAMSfjQnl7KLqKkhWijOPCqsfmzMX5BSzggBcI/Axi58evskHKweuA+x1hU8Qm8Cp+B 8aqFHXGDDZfAkbinEnU8sKQGW1bYinXXL+1Aoh65Qwt2t7I4+5VbYVOdSa6jDE+4n9iqgh 4xwKoY8WXANf/fsDCHEwOiXmfiD1w+5KiARcg5vLDP9SPpqVAX+xj62y/lPB8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707493285; 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=cSdJlAbnIROp5no2eleiX83S/1TFcZh/UNDvVyCAdc8=; b=ykzSJlF+MzdIk+v9rr+4YWB2IckLGlx5WDMQDN9as2YzDi7jMK5BP8Upu6K8SPo941tw2Z P/LlSzLCIz+f/3lj7ZUXSPzU/kjZtsD/r1w7jSxUmc9TcY9ZOaYwX1PKOO07j7AuiA79Bd eOwMO/8f5RGfAsY88HCTGpH0THlKSMD8xlncNhdH+WWgTZ4nrl9lHzSkjKPl8Pgrrtf/2s vQip0e91RqI4UYMwE0LQAMHa+NubGMpVWuqeB8i5vgBF3MmIP+tfDFVB9N6ASeVezAYkgH PHxIAht899oYqOzsiYucp64jmdT/cL+2s2pq5NvyfOXaT3Y7aJq4ANgl8jRPNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707493285; a=rsa-sha256; cv=none; b=XIfFj/LX3DpYcxj2XPvGFXJpf8KvTQx2jjc7qNL0NZNs7WuSjPd9Q1h6ZLrAbd0R4uTSLA arNFe25bnzCcREOQtpSnwBkm8P05L1W90VFhHZsptHISL3yNCPcqKXJtVnGbBOsX4q9hPj cUO2Psm9MQZGXPRsOC7BYTapLA2DgFo/79s9K7FyRrsDnQuCRfTVXHAnl+C0NgT3NI0Ra1 x3AvrNyyR6A0NPiekoa7DrYEAki5ZzlvqZePOAv4OECZzeuiaPAeVsSkbyzvo6Vq8fs0W7 124gxA7qk3O581uUy8e9Cocgt90WFKlVDhNQbkgBSfiQkKdD9kIqwpMC2+0wkg== 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 4TWdPJ5yzjzf5l; Fri, 9 Feb 2024 15:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 419FfOUm048350; Fri, 9 Feb 2024 15:41:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 419FfOru048334; Fri, 9 Feb 2024 15:41:24 GMT (envelope-from git) Date: Fri, 9 Feb 2024 15:41:24 GMT Message-Id: <202402091541.419FfOru048334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8b620483bbd6 - stable/13 - scsi_cd: Use a bool for the second parameter of cdcheckmedia() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8b620483bbd60fbcc1374d195bb9eaf327434135 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8b620483bbd60fbcc1374d195bb9eaf327434135 commit 8b620483bbd60fbcc1374d195bb9eaf327434135 Author: Mark Johnston AuthorDate: 2024-01-30 01:00:13 +0000 Commit: Mark Johnston CommitDate: 2024-02-09 15:38:18 +0000 scsi_cd: Use a bool for the second parameter of cdcheckmedia() No functional change intended. Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43525 (cherry picked from commit b1710124ff14f96db4c2a8fa37fc7c7b433fb176) --- sys/cam/scsi/scsi_cd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index d5c3dd02df1d..76e413064781 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -264,7 +264,7 @@ static union cd_pages *cdgetpage(struct cd_mode_params *mode_params); static int cdgetpagesize(int page_num); static void cdprevent(struct cam_periph *periph, int action); static void cdmediaprobedone(struct cam_periph *periph); -static int cdcheckmedia(struct cam_periph *periph, int do_wait); +static int cdcheckmedia(struct cam_periph *periph, bool do_wait); #if 0 static int cdsize(struct cam_periph *periph, u_int32_t *size); #endif @@ -775,7 +775,7 @@ cdopen(struct disk *dp) * if we don't have media, but then we don't allow anything but the * CDIOCEJECT/CDIOCCLOSE ioctls if there is no media. */ - cdcheckmedia(periph, /*do_wait*/ 1); + cdcheckmedia(periph, /*do_wait*/ true); CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("leaving cdopen\n")); cam_periph_unhold(periph); @@ -881,7 +881,7 @@ cdstrategy(struct bio *bp) * check first. The I/O will get executed after the media check. */ if ((softc->flags & CD_FLAG_VALID_MEDIA) == 0) - cdcheckmedia(periph, /*do_wait*/ 0); + cdcheckmedia(periph, /*do_wait*/ false); else xpt_schedule(periph, CAM_PRIORITY_NORMAL); @@ -1782,7 +1782,7 @@ cdioctl(struct disk *dp, u_long cmd, void *addr, int flag, struct thread *td) && ((cmd != CDIOCCLOSE) && (cmd != CDIOCEJECT)) && (IOCGROUP(cmd) == 'c')) { - error = cdcheckmedia(periph, /*do_wait*/ 1); + error = cdcheckmedia(periph, /*do_wait*/ true); if (error != 0) { cam_periph_unhold(periph); cam_periph_unlock(periph); @@ -2683,7 +2683,7 @@ cdmediaprobedone(struct cam_periph *periph) */ static int -cdcheckmedia(struct cam_periph *periph, int do_wait) +cdcheckmedia(struct cam_periph *periph, bool do_wait) { struct cd_softc *softc; int error;