From nobody Sun Feb 13 08:26:30 2022 X-Original-To: dev-commits-src-main@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 442BF194D2B8; Sun, 13 Feb 2022 08:26:30 +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 4JxL6Z1TXZz4S8g; Sun, 13 Feb 2022 08:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644740790; 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=xrS6Ah5ytwEuVK99HEXgyC3XcCD5ogXUujJZjOKx9ts=; b=D7HDA7YX0f+s/fH76vzH92yIW7puJD4EXwDBoaLxCbzcDbOt/Ez3W/qPkqfkHcWbsWxEsj ne7q81p6phkD1HqqCQkTAjQUHWCTXMHhwdLcJAxzgYDYdHa5Wlvpg8/y0woV+74MZJHnRg 80gjKqM7grXxHR7s64JM+f3GV9GmaowxcZIDeeUgBJev9oHu88ITy5Tolqcp/aXEGKe5uV 9wCclLbAZ5HalxN2VR0bA2ueff96gc5CS0R8mNoYSEcvKWphOZC5n4FrrEtFFiZ/bB17Lt x8NFGixtZGYvXQ4DhUBcxgkgHgr4Qcuqu9vhFDsPZakyN3LyGVSx5yZONyPnNQ== 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 1277717AFE; Sun, 13 Feb 2022 08:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21D8QUKJ098853; Sun, 13 Feb 2022 08:26:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21D8QUWV098852; Sun, 13 Feb 2022 08:26:30 GMT (envelope-from git) Date: Sun, 13 Feb 2022 08:26:30 GMT Message-Id: <202202130826.21D8QUWV098852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 70e9f880d88e - main - iscsi: address unused-but-set-variable warning List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70e9f880d88e9d67da23777d95c5649f1aaceee7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644740790; 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=xrS6Ah5ytwEuVK99HEXgyC3XcCD5ogXUujJZjOKx9ts=; b=qK1p4zqHdhW0ILZZI1ydAexDTDhGgLzuIS+p5W4AxPfHBruwHcuuPnciu8bsFqgK2IrM5V 3wlhkrqosbZhoc0oA2qfAJUGXWD5rNmYLveBiTd6L0eQuvMziNe+8SbtiscS2auEYxj0Lp ovQ7zkfVDGFR/3eP4a4NRj3O79qj6gZfSIl+hkYTRIBeBklNBsgPaKBG2imN9ybEpOZv+F YuYGTsr2CjnPEPdOWQh1iGQOhRjgnHL2i6EB8R8qylDwlBmVTiAPrixrGU0JSZQ9S7EvaF UaCMXRlBMcnzlcz2APKo//AlTsgNnV3MPc5sKlHh4mrLcLNJ7ApZAYEG5jzajw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644740790; a=rsa-sha256; cv=none; b=ForLnz33omY8uKKbZDqMLb0psBou0zKlgmG3vqZUUbs9Pi/A73naEsVok7ymtldUdzWpzY XRozyvZ+rJtLR77Bxbzs6bfyC0OHLzGey3DFMx6G239+geYJytszHpzcZ9t+noje8zMLTu dRJSqeaSZzUQe1vFyCPoUoHn70lH2I7iZpaspzgUBiMk2r/dhiSSHlMDlZ28K7Lpav6an4 Zd+Ydm5ytMKKZ75oJYllFa1IerG3ApbWlbLtGWi+csZvl+EQWk0U5Idcy2CiCUH5cfzXyD i+r/O/mMUK+6R9sDooHIdyrrx0iyc+l5OWHpDRQy4apfHiNLnHTQ6mlFfi4ogA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=70e9f880d88e9d67da23777d95c5649f1aaceee7 commit 70e9f880d88e9d67da23777d95c5649f1aaceee7 Author: Richard Scheffenegger AuthorDate: 2022-02-12 05:11:28 +0000 Commit: Richard Scheffenegger CommitDate: 2022-02-12 05:15:02 +0000 iscsi: address unused-but-set-variable warning remove "interrupted" in icl_soft_proxy_connect() Reviewed By: hselasky Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D34223 --- sys/dev/iscsi/icl_soft_proxy.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/dev/iscsi/icl_soft_proxy.c b/sys/dev/iscsi/icl_soft_proxy.c index 693fe3a59ba6..22beacb0f941 100644 --- a/sys/dev/iscsi/icl_soft_proxy.c +++ b/sys/dev/iscsi/icl_soft_proxy.c @@ -111,7 +111,6 @@ icl_soft_proxy_connect(struct icl_conn *ic, int domain, int socktype, { struct socket *so; int error; - int interrupted = 0; error = socreate(domain, &so, socktype, protocol, curthread->td_ucred, curthread); @@ -136,11 +135,8 @@ icl_soft_proxy_connect(struct icl_conn *ic, int domain, int socktype, while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) { error = msleep(&so->so_timeo, SOCK_MTX(so), PSOCK | PCATCH, "icl_connect", 0); - if (error) { - if (error == EINTR || error == ERESTART) - interrupted = 1; + if (error) break; - } } if (error == 0) { error = so->so_error;