From nobody Tue Jan 30 14:31:31 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 4TPSKH5CZRz58x1L; Tue, 30 Jan 2024 14:31:31 +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 4TPSKH2KZRz4mmK; Tue, 30 Jan 2024 14:31:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706625091; 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=mFcbEGoytjZJMZeVAEBzBT2BmnTP9zwM3Bek9NYEQOs=; b=QQ4wZttL0EDlsKQ0yrMHB2lQDAP99RBrJOoI0h1Mv0M+WPbWPyJXUewFjrJOpf7az0SGAR ifA7F25FsDCqw5XTeC+ycnrU7kHMlc8+rNntCDgvmGG2T22hW4mvOaZB8zQvfWMPF9lBL3 nlYzgg5JojkxMMR111ozhjEarKY7kxb3605FXkvfrQjKs7WgUgM6gMt55Wym4Lozyhsfna /tJ/2XSvA7oyeXkVILrk6sIP2VqJhUx6xj4PnmtCsw7aElmuARosdX7Nangb7BurmkTchm TtQjtn7su6renusJQpFTeP9Rk7mcPU/Bi4LIkr1OSBAHGqS7KxoObmo0QMfeIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706625091; 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=mFcbEGoytjZJMZeVAEBzBT2BmnTP9zwM3Bek9NYEQOs=; b=N8aBxtof4+xKoDdKIB2cBGF3gS60v/njQFkndH+huSFoPkJj7vxktd4W6Pkxfj6pnHyM/Y 3N5tPF3uVd/we2PoL20tu2v+Y6AAr8cfaPALx5ej5J6MENFJiptNFEehIBxUqe8TS8KhzO Vi2EIKBIz7vhWKDDBNppHq7g964H/ILmijkr35gaFgZg/2nNRVpKuBx5UGLp0zexacXiv/ x74Rj6A5/riPegql11LLP8DYoE4yxSAFAsr5BnhOYE4Ty1zgaz5UMBY14r//arWDpx2sVV Y7hiqz1lOKjLWCBdxx9lEg5Q8Xv08DkWrqdg/3fLvpJ2glZ7MDWPLtmF3RKmKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706625091; a=rsa-sha256; cv=none; b=FoG1otbkhJuYaiurFMfXAN/CliBF86iAgyA42IZG5x2Dur2JqJAz9on8UM0kLdW46tSLno IR8fNxCq4JNs4iLxqmoHFJio4QUIBAzrlqyrZdGqQB5AoEIIk2RYKI0lnqv/YQNuycETzq Me1SfWhxhiMkv4oPoyQIvNnOKQhiluoKCkBJuPmUK4sYBaNlwgg8dVUC2gKtvfOlc8Td4P 0fIcVVWMjPBOIsHS92+sT8gCHU+U+4ydUqBNjxLsK17XCf0rVHElDpjoxAWVYK73i3VkB9 ZwBjn7QNzPEAGyzf3lqqDcUzNpv01EJZ9UJG/Dl7Wkwtl/r+ZZtazZhodAI2sA== 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 4TPSKH1LgTzf57; Tue, 30 Jan 2024 14:31:31 +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 40UEVV1F025417; Tue, 30 Jan 2024 14:31:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40UEVV3W025414; Tue, 30 Jan 2024 14:31:31 GMT (envelope-from git) Date: Tue, 30 Jan 2024 14:31:31 GMT Message-Id: <202401301431.40UEVV3W025414@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b1710124ff14 - main - scsi_cd: Use a bool for the second parameter of cdcheckmedia() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1710124ff14f96db4c2a8fa37fc7c7b433fb176 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b1710124ff14f96db4c2a8fa37fc7c7b433fb176 commit b1710124ff14f96db4c2a8fa37fc7c7b433fb176 Author: Mark Johnston AuthorDate: 2024-01-30 01:00:13 +0000 Commit: Mark Johnston CommitDate: 2024-01-30 14:24:36 +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 --- 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 b892708ffb99..350b7f053ffd 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -262,7 +262,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, uint32_t *size); #endif @@ -773,7 +773,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); @@ -879,7 +879,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); @@ -1781,7 +1781,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); @@ -2682,7 +2682,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;