The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=70e9f880d88e9d67da23777d95c5649f1aaceee7
commit 70e9f880d88e9d67da23777d95c5649f1aaceee7 Author: Richard Scheffenegger <[email protected]> AuthorDate: 2022-02-12 05:11:28 +0000 Commit: Richard Scheffenegger <[email protected]> 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;
