s/is->is_conn/ic to shorten things a bit.
This commit is contained in:
parent
a5d8944a83
commit
f5cadbc463
@ -1329,6 +1329,7 @@ iscsi_ioctl_daemon_handoff(struct iscsi_softc *sc,
|
||||
struct iscsi_daemon_handoff *handoff)
|
||||
{
|
||||
struct iscsi_session *is;
|
||||
struct icl_conn *ic;
|
||||
int error;
|
||||
|
||||
sx_slock(&sc->sc_lock);
|
||||
@ -1345,6 +1346,7 @@ iscsi_ioctl_daemon_handoff(struct iscsi_softc *sc,
|
||||
return (ESRCH);
|
||||
}
|
||||
ISCSI_SESSION_LOCK(is);
|
||||
ic = is->is_conn;
|
||||
if (is->is_conf.isc_discovery || is->is_terminating) {
|
||||
ISCSI_SESSION_UNLOCK(is);
|
||||
sx_sunlock(&sc->sc_lock);
|
||||
@ -1374,13 +1376,13 @@ iscsi_ioctl_daemon_handoff(struct iscsi_softc *sc,
|
||||
is->is_first_burst_length = handoff->idh_first_burst_length;
|
||||
|
||||
if (handoff->idh_header_digest == ISCSI_DIGEST_CRC32C)
|
||||
is->is_conn->ic_header_crc32c = true;
|
||||
ic->ic_header_crc32c = true;
|
||||
else
|
||||
is->is_conn->ic_header_crc32c = false;
|
||||
ic->ic_header_crc32c = false;
|
||||
if (handoff->idh_data_digest == ISCSI_DIGEST_CRC32C)
|
||||
is->is_conn->ic_data_crc32c = true;
|
||||
ic->ic_data_crc32c = true;
|
||||
else
|
||||
is->is_conn->ic_data_crc32c = false;
|
||||
ic->ic_data_crc32c = false;
|
||||
|
||||
is->is_cmdsn = 0;
|
||||
is->is_expcmdsn = 0;
|
||||
@ -1399,7 +1401,7 @@ iscsi_ioctl_daemon_handoff(struct iscsi_softc *sc,
|
||||
/*
|
||||
* Handoff without using ICL proxy.
|
||||
*/
|
||||
error = icl_conn_handoff(is->is_conn, handoff->idh_socket);
|
||||
error = icl_conn_handoff(ic, handoff->idh_socket);
|
||||
if (error != 0) {
|
||||
sx_sunlock(&sc->sc_lock);
|
||||
iscsi_session_terminate(is);
|
||||
|
Loading…
Reference in New Issue
Block a user