From owner-svn-src-all@freebsd.org Tue Sep 3 14:06:25 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5840CDC30F; Tue, 3 Sep 2019 14:06:05 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46N7z01k5qz4P9K; Tue, 3 Sep 2019 14:06:04 +0000 (UTC) (envelope-from yuripv@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1452) id 28C561A0B4; Tue, 3 Sep 2019 14:05:57 +0000 (UTC) X-Original-To: yuripv@localmail.freebsd.org Delivered-To: yuripv@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id C9A0B4657; Tue, 2 Apr 2019 16:43:48 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3616E6CDFD; Tue, 2 Apr 2019 16:43:48 +0000 (UTC) (envelope-from owner-src-committers@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 538) id 0EFB94640; Tue, 2 Apr 2019 16:43:48 +0000 (UTC) Delivered-To: src-committers@localmail.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by freefall.freebsd.org (Postfix) with ESMTPS id 577F9463D; Tue, 2 Apr 2019 16:43:45 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F3C4A6CDF8; Tue, 2 Apr 2019 16:43:44 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pl1-x62e.google.com with SMTP id b65so6545229plb.6; Tue, 02 Apr 2019 09:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=FwFRc1sFMTLcvAX8/iIRPvWp8m8kbm8OLl/pgECRbHY=; b=iUEoSJEwSNIGia+36XL1KpMBKJPU9vO2gKtNuncvW4JRtZ4fH31oMcGke4iFjdFPd/ SHlzB87BnMAac+KxWlnZxf4UrKM1MACl6apOVxrQevWQX8hKWAFTILs80401k/tdDese +yzcKM/Q2ge/wwulO1UItUJi83vsXR9ptDwE7LGkQou1Hi4NILnDkxrF6VhAcEmpvYNs T1pd/8wKVUT50HmB1Guws2ZjZXNrqryTBb4yQCiVLoT8c8zWcm9qqIIGRdGILMqxFOif D3ZFfFDxqPZD6BZ29mgTxEzO9TI7ZYB1ykHge9o33W5MbpB6UsV8PYRRJFnxRSLyMwIj j0Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=FwFRc1sFMTLcvAX8/iIRPvWp8m8kbm8OLl/pgECRbHY=; b=qbyA+hnZUA5mTYyS5hJ1D4MSb6+zi3a1T0TcE40oWgMzpXzeRu5c5IqUaPT6CMqpYY mZvApExUH25XzvNVmadL0bH+co3jaCTmptHMEJuIJYTb8Dhg9mqSiCnTQI9yra3BkWi1 j8VAvD/Xe1bYiC//73bZnUBFlVGoFDoTVlBu0rQVNBtUJe37/H5FcOEbq9aM6fzO9YGg jcM+iUSVUWAddIuIGUlgFd2UYdrv05dtXJAaleyu5PXUWQBWcJWmdEBKA0J26CAn7PCH Ff8Gfy2VInbg5FbL2oCN6HHgGvKz09pwwB0cTNRMFuvBnsX2a9MZAGuqCUCmzo2Ta/Ub z+Rw== X-Gm-Message-State: APjAAAUJK3I6lHC8AclED9mDOtRJEsdeobpXrAxfV9Jq+vihuz5/PY93 cGGQpYd2qSQBFd1Uz4r8qCxOdCSY X-Google-Smtp-Source: APXvYqzXg8Q79LGNiFkW0QlNvrvgPKwbPk28JclRnfK1Eiw9FdRDpcUfjfC0XxAhSwjI0jYWc+niHw== X-Received: by 2002:a17:902:e391:: with SMTP id ch17mr12235729plb.196.1554223423451; Tue, 02 Apr 2019 09:43:43 -0700 (PDT) Received: from ?IPv6:2607:fb90:837c:f605:f5ef:10c5:4773:983b? ([2607:fb90:837c:f605:f5ef:10c5:4773:983b]) by smtp.gmail.com with ESMTPSA id k131sm22742165pfc.183.2019.04.02.09.43.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 09:43:42 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r345805 - head/sys/cam From: Enji Cooper X-Mailer: iPhone Mail (16E227) In-Reply-To: <201904021446.x32EkBM7016545@repo.freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <201904021446.x32EkBM7016545@repo.freebsd.org> To: Alexander Motin Precedence: bulk X-Loop: FreeBSD.org Sender: owner-src-committers@freebsd.org X-Rspamd-Queue-Id: 3616E6CDFD X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Status: O X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Tue, 03 Sep 2019 14:06:25 -0000 X-Original-Date: Tue, 2 Apr 2019 09:43:40 -0700 X-List-Received-Date: Tue, 03 Sep 2019 14:06:25 -0000 Hi Alexander, > On Apr 2, 2019, at 07:46, Alexander Motin wrote: >=20 > Author: mav > Date: Tue Apr 2 14:46:10 2019 > New Revision: 345805 > URL: https://svnweb.freebsd.org/changeset/base/345805 >=20 > Log: > Unify SCSI_STATUS_BUSY retry handling with other cases. >=20 > - Do not retry if periph was invalidated. > - Do not decrement retry_count if already zero. > - Report action_string when applicable. >=20 > MFC after: 2 weeks >=20 > Modified: > head/sys/cam/cam_periph.c >=20 > Modified: head/sys/cam/cam_periph.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/sys/cam/cam_periph.c Tue Apr 2 14:01:03 2019 (r345804) > +++ head/sys/cam/cam_periph.c Tue Apr 2 14:46:10 2019 (r345805) > @@ -1513,6 +1513,7 @@ camperiphscsistatuserror(union ccb *ccb, union ccb *= *o > int *openings, u_int32_t *relsim_flags, > u_int32_t *timeout, u_int32_t *action, const char **action_string) > { > + struct cam_periph *periph; > int error; >=20 > switch (ccb->csio.scsi_status) { > @@ -1595,14 +1596,21 @@ camperiphscsistatuserror(union ccb *ccb, union ccb= **o > * Restart the queue after either another > * command completes or a 1 second timeout. > */ > - if ((sense_flags & SF_RETRY_BUSY) !=3D 0 || > - (ccb->ccb_h.retry_count--) > 0) { > + periph =3D xpt_path_periph(ccb->ccb_h.path); > + if (periph->flags & CAM_PERIPH_INVALID) { Is there a reason why this style is inconsistent with the other part of the c= hange by not explicitly testing for =E2=80=9C!=3D 0=E2=80=9D? Thanks! -Enji=