From nobody Thu Jul 20 23:19:53 2023 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 4R6TDV1dv0z4nkNX; Thu, 20 Jul 2023 23:19:54 +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 4R6TDV1BLlz3FL4; Thu, 20 Jul 2023 23:19:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689895194; 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=0d9YbcgUbv4ARI2yKHuSfjMdGqDOcicYFNCnH7uacLk=; b=ftL5CApu9K0l9w43xY2IHNJQtX3X1aNSCjq7Ijq9HdPc02qjGl8TftGeQaB3M+5yPAIWEg F6GlJob43rsr3FKTotVjBmdHyWQEYat1SVZhAtTVrxeZC6pCZ5NF6Nt2ICv+RbV24L0MJO tM7VpEMoPNdko8PTC8XE4xrew9nU7x8Pvp2UGyRGrW1KEIGSnpyvz0ioQhW0fCVd+bPo6k Yc5OkEXbhJujt399eQ3ERCfiPO6Mbj3enKlOEiuiJIXsaCBXuidGWMPUeOQ3quW0uJEQ15 njz4E03o7mhZYS4qT+WHDetqdy6lLY6mJBIpQ59dbLq5ccVnRSFC8o7f/Kec8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689895194; 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=0d9YbcgUbv4ARI2yKHuSfjMdGqDOcicYFNCnH7uacLk=; b=ZebBr/LzAv+MSj+b5LrTlU6XVpF4ric02ocymVaLFNYCyW6kVg5e2Iahq/SPmWN3HzNeTM t4Y3CYn3Zz059AmiwHh48zY1g2A6tYSK0+cPtaGJJxAJzzHtomdTogM8Ss4XtXlt4kXYX2 QeRjGBjSVbei7LgV7Kg/Ur7ivrL1jxW9/YfMX5XyiPV8zrqV25tipLpfy3x+FxTEfDHZKn ociHXOkE7D8le90lQeBzydTc5SHYD58P1nyh59Xw7N3nxAdadDMrk+4fx1Qa/1OJoKdCSR csMmcbEA/VCyhliVER1ibBp6Qhhs8sx+G4GoGMAXhqVR25U84S+gYeKYH5P7vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689895194; a=rsa-sha256; cv=none; b=DljvRvH12v8CuXGXy4KwcXJuAge4a7Meg/lnCgnv+WzuySzseeHrfzI1JmjLVc0cKWk0b0 xJX02C5Y6wRjQ44l4jJmr0DfPecLxb5YmHTFkTAODc1e/CabVS3yTQn8xzozuaye5UoNmB vsjIUwChY2diw1iBca9lOyqDr291o6QAoiHTS/kDVKrAJMT60sgAzIXdcwmogHLoT2PgLu DGlU2OciMLFGeIUrp9btM0APOC6NGzXnyz39ANPaMRgVaGKrHnAL6MpqXc8/3Ugxq7Uu+M ropdnboXMgeQQp2dZcimCYqL/1KvVDSJAVx7wfWs5Py7PFKNE2BrqXPYCysZ/w== 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 4R6TDV0BNTzq4F; Thu, 20 Jul 2023 23:19:54 +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 36KNJrSW085668; Thu, 20 Jul 2023 23:19:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KNJriX085667; Thu, 20 Jul 2023 23:19:53 GMT (envelope-from git) Date: Thu, 20 Jul 2023 23:19:53 GMT Message-Id: <202307202319.36KNJriX085667@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: 59dc489a7e03 - main - mpr: Fix minor 'typos' comment 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: 59dc489a7e034674c3f52c56c95851bf31dc790b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=59dc489a7e034674c3f52c56c95851bf31dc790b commit 59dc489a7e034674c3f52c56c95851bf31dc790b Author: Warner Losh AuthorDate: 2023-07-20 23:16:04 +0000 Commit: Warner Losh CommitDate: 2023-07-20 23:18:28 +0000 mpr: Fix minor 'typos' comment moving -> removing (we're removing the device) CAM_REQ_CMO_ERROR -> CAM_REQ_ERR (the former isn't a thing) Sponsored by: Netflix --- sys/dev/mpr/mpr_sas.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/mpr/mpr_sas.c b/sys/dev/mpr/mpr_sas.c index dd630d212b7f..06dbed57dbac 100644 --- a/sys/dev/mpr/mpr_sas.c +++ b/sys/dev/mpr/mpr_sas.c @@ -2767,13 +2767,13 @@ mprsas_scsiio_complete(struct mpr_softc *sc, struct mpr_command *cm) * count by returning CAM_REQUEUE_REQ. Unfortunately, if * we hit a persistent drive problem that returns one of * these error codes, we would retry indefinitely. So, - * return CAM_REQ_CMP_ERROR so that we decrement the retry + * return CAM_REQ_CMP_ERR so that we decrement the retry * count and avoid infinite retries. We're taking the * potential risk of flagging false failures in the event * of a topology-related error (e.g. a SAS expander problem * causes a command addressed to a drive to fail), but * avoiding getting into an infinite retry loop. However, - * if we get them while were moving a device, we should + * if we get them while were removing a device, we should * fail the request as 'not there' because the device * is effectively gone. */