From nobody Fri Feb 9 15:04:23 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 4TWcZc1XjRz59qm6; Fri, 9 Feb 2024 15:04:24 +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 4TWcZb6hHkz4FX2; Fri, 9 Feb 2024 15:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707491063; 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=vru+IA+xmJKnHYDkpyTTd5r97f7W9fUz6jh4epm+mv8=; b=Mqwt3/X8cr8mZzSj/O18tPRvXHPfy7/NAc9A+DCOLRLC11TIrDa8U49sUTKHXnFSQACgbL 0JRhqxKqWikIQfnnHAG6c04Ff7bUR3O6QkRTkhPdqBsx/qCoM3/PtSBVdG2V8nrD8gPz0L M9wimcmd/2Jt5KNdG+1IKyBz+EDZ93jjykZgGLB/MjJGI0ZUI60wj8decsqxRa4MtGbym/ P6TSDgseWMeMx1zR87970mEgDpsH1/Ucp6yuIVFWWulKmH1POdmVZ7Y9q3UzG+DwPGKPSy l1sgDchq+qYwL+v2U0foQ23UUWKSrTmz4omaulUGkKdNgC7fZdKdiGNCnjyoPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707491063; 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=vru+IA+xmJKnHYDkpyTTd5r97f7W9fUz6jh4epm+mv8=; b=yzscVm3q/C0/oi11AjRiURAGRmsN0XWWVGbxp+GJgX50jk/nVDLwzfO35Wr5FrQ2uZd/4+ Bno7anm4kfc/X7jd6/WwHjbBFDtsyKmFsXprPYLKud1uDjEJ412lIYpilp/GDbJH0UR1ox E1R3RpkBrJtGT3X4NJiGiBSH19CxvIcnzr62hvHPeUcToV4l3RjtHWA8QDfWIRyyqtImmj 2T9aozXusiTpG16sheUl9Lj2LGr6PDf9kFpC2YoHIr2mu1ff56VDk/YmTS1/bGKeofj0Hn YfKmsH05X0qAuA3I8AUxz/4oe4w01keuy7MqNE4ufq6els6bnMSkZBSpjoBtSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707491063; a=rsa-sha256; cv=none; b=tQG7+5cupzvRFzB4XYhZ5uFkBXncBFJo6uboFkhRH8DvcF70QvWi6pU1lrDFte3lFJ/z6E yInkmwIqpswtv8lfVskBFlpGvGfimxyy0fni1NKmGKMGnmqrwcGo4od/sCXSucNUMkQjZb HTDGgM+hA/bvsv6w3KS6jA3F6WSxFJ7DkJHicBV6lvjFWVD+LoVMvbB9pAUs41PjDhTPM3 Gy5Km99sGNVnfhAbMjQPGjioGUqUHA0tdOVrK16np52uO8J6omBxwe2tpSn4u8IV+DYC15 2qpKeiPWGOJKi1nf4vbzWvHdnTJF+51h3Y/kGAYnaUT0FefniwQNMt7Cxh+Zng== 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 4TWcZb5WNwzdBD; Fri, 9 Feb 2024 15:04:23 +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 419F4NOc085408; Fri, 9 Feb 2024 15:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 419F4NSP085405; Fri, 9 Feb 2024 15:04:23 GMT (envelope-from git) Date: Fri, 9 Feb 2024 15:04:23 GMT Message-Id: <202402091504.419F4NSP085405@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: fe44b0cae643 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: fe44b0cae643c8f5aa9b6c97a0b8f2c1e073c5d4 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fe44b0cae643c8f5aa9b6c97a0b8f2c1e073c5d4 commit fe44b0cae643c8f5aa9b6c97a0b8f2c1e073c5d4 Author: Mark Johnston AuthorDate: 2024-01-30 01:00:13 +0000 Commit: Mark Johnston CommitDate: 2024-02-09 14:55:45 +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 9891110e6b3d..d3299486ac2d 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -263,7 +263,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 @@ -774,7 +774,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); @@ -880,7 +880,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;