Date: Tue, 1 Sep 2020 21:30:23 +0000 (UTC) From: Mateusz Guzik <mjg@FreeBSD.org> 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 Message-ID: <202009012130.081LUNc0025651@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009012130.081LUNc0025651>