From owner-svn-src-head@freebsd.org Tue Sep 1 21:30:24 2020 Return-Path: Delivered-To: svn-src-head@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 A594D379FD1; Tue, 1 Sep 2020 21:30:24 +0000 (UTC) (envelope-from mjg@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0bh3xq7z4LWw; Tue, 1 Sep 2020 21:30:24 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6AF9C1FB3F; Tue, 1 Sep 2020 21:30:24 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LUOpw025657; Tue, 1 Sep 2020 21:30:24 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LUNc0025651; Tue, 1 Sep 2020 21:30:23 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012130.081LUNc0025651@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:30:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365090 - in head/sys/dev: iscsi iscsi_initiator X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/dev: iscsi iscsi_initiator X-SVN-Commit-Revision: 365090 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:30:24 -0000 Author: mjg Date: Tue Sep 1 21:30:22 2020 New Revision: 365090 URL: https://svnweb.freebsd.org/changeset/base/365090 Log: iscsi: clean up empty lines in .c and .h files Modified: head/sys/dev/iscsi/icl_soft.c head/sys/dev/iscsi/icl_soft_proxy.c head/sys/dev/iscsi/iscsi.c head/sys/dev/iscsi_initiator/isc_cam.c head/sys/dev/iscsi_initiator/iscsi.c head/sys/dev/iscsi_initiator/iscsi_subr.c Modified: head/sys/dev/iscsi/icl_soft.c ============================================================================== --- head/sys/dev/iscsi/icl_soft.c Tue Sep 1 21:30:01 2020 (r365089) +++ head/sys/dev/iscsi/icl_soft.c Tue Sep 1 21:30:22 2020 (r365090) @@ -954,7 +954,6 @@ icl_conn_send_pdus(struct icl_conn *ic, struct icl_pdu request = STAILQ_FIRST(queue); size = icl_pdu_size(request); if (available < size) { - /* * Set the low watermark, to be checked by * sowriteable() in icl_soupcall_send() Modified: head/sys/dev/iscsi/icl_soft_proxy.c ============================================================================== --- head/sys/dev/iscsi/icl_soft_proxy.c Tue Sep 1 21:30:01 2020 (r365089) +++ head/sys/dev/iscsi/icl_soft_proxy.c Tue Sep 1 21:30:22 2020 (r365090) @@ -192,7 +192,7 @@ icl_listen_free(struct icl_listen *il) pause("icl_unlisten", 1 * hz); sx_xlock(&il->il_lock); } - + TAILQ_REMOVE(&il->il_sockets, ils, ils_next); soclose(ils->ils_socket); free(ils, M_ICL_PROXY); @@ -325,7 +325,6 @@ icl_listen_add(struct icl_listen *il, bool rdma, int d ICL_DEBUG("RDMA not supported"); return (EOPNOTSUPP); } - return (icl_listen_add_tcp(il, domain, socktype, protocol, sa, portal_id)); Modified: head/sys/dev/iscsi/iscsi.c ============================================================================== --- head/sys/dev/iscsi/iscsi.c Tue Sep 1 21:30:01 2020 (r365089) +++ head/sys/dev/iscsi/iscsi.c Tue Sep 1 21:30:22 2020 (r365090) @@ -398,14 +398,14 @@ iscsi_maintenance_thread_reconnect(struct iscsi_sessio } cv_signal(&is->is_login_cv); #endif - + if (fail_on_disconnection) { ISCSI_SESSION_DEBUG(is, "connection failed, destroying devices"); iscsi_session_cleanup(is, true); } else { iscsi_session_cleanup(is, false); } - + KASSERT(TAILQ_EMPTY(&is->is_outstanding), ("destroying session with active tasks")); KASSERT(STAILQ_EMPTY(&is->is_postponed), @@ -1037,7 +1037,7 @@ iscsi_pdu_handle_data_in(struct icl_pdu *response) union ccb *ccb; struct ccb_scsiio *csio; size_t data_segment_len, received, oreceived; - + is = PDU_SESSION(response); bhsdi = (struct iscsi_bhs_data_in *)response->ip_bhs; io = iscsi_outstanding_find(is, bhsdi->bhsdi_initiator_task_tag); Modified: head/sys/dev/iscsi_initiator/isc_cam.c ============================================================================== --- head/sys/dev/iscsi_initiator/isc_cam.c Tue Sep 1 21:30:01 2020 (r365089) +++ head/sys/dev/iscsi_initiator/isc_cam.c Tue Sep 1 21:30:22 2020 (r365090) @@ -211,7 +211,7 @@ ic_action(struct cam_sim *sim, union ccb *ccb) return; break; } - + case XPT_CALC_GEOMETRY: { struct ccb_calc_geometry *ccg; @@ -330,7 +330,6 @@ ic_init(isc_session_t *sp) if(xpt_bus_register(sim, NULL, 0/*bus_number*/) != CAM_SUCCESS) { - cam_sim_free(sim, /*free_devq*/TRUE); mtx_destroy(&sp->cam_mtx); return ENXIO; Modified: head/sys/dev/iscsi_initiator/iscsi.c ============================================================================== --- head/sys/dev/iscsi_initiator/iscsi.c Tue Sep 1 21:30:01 2020 (r365089) +++ head/sys/dev/iscsi_initiator/iscsi.c Tue Sep 1 21:30:22 2020 (r365090) @@ -370,7 +370,6 @@ iscsi_read(struct cdev *dev, struct uio *uio, int iofl sprintf(buf, "/---- socket -----/\nso_count=%d so_state=%x\n", so->so_count, so->so_state); uiomove(buf, strlen(buf), uio); - } #endif return 0; @@ -749,7 +748,7 @@ iscsi_start(void) iscsi_driver_version, 0, "iscsi driver version"); - + SYSCTL_ADD_STRING(&isc->clist, SYSCTL_CHILDREN(isc->oid), OID_AUTO, Modified: head/sys/dev/iscsi_initiator/iscsi_subr.c ============================================================================== --- head/sys/dev/iscsi_initiator/iscsi_subr.c Tue Sep 1 21:30:01 2020 (r365089) +++ head/sys/dev/iscsi_initiator/iscsi_subr.c Tue Sep 1 21:30:22 2020 (r365090) @@ -409,7 +409,7 @@ iscsi_reject(isc_session_t *sp, pduq_t *opq, pduq_t *p //XXX: check RFC 10.17.1 (page 176) ccb->ccb_h.status = CAM_REQ_ABORTED; xpt_done(ccb); - + pdu_free(sp->isc, opq); }