aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/iscsi/iscsi.c
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2013-12-10 18:18:39 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2013-12-10 18:18:39 +0000
commit0260023fbba8c5e45b9d208046a662d739c1aa37 (patch)
treef65de7edcfd707c97d6071fd3447255eb3b7bce4 /sys/dev/iscsi/iscsi.c
parentb30f0d901a6c0441cc194c4cc1aed6365c0b1163 (diff)
downloadsrc-0260023fbba8c5e45b9d208046a662d739c1aa37.tar.gz
src-0260023fbba8c5e45b9d208046a662d739c1aa37.zip
Notes
Diffstat (limited to 'sys/dev/iscsi/iscsi.c')
-rw-r--r--sys/dev/iscsi/iscsi.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c
index 2f5328db3229..395c8bb2ff38 100644
--- a/sys/dev/iscsi/iscsi.c
+++ b/sys/dev/iscsi/iscsi.c
@@ -1247,6 +1247,18 @@ iscsi_ioctl_daemon_handoff(struct iscsi_softc *sc,
sx_sunlock(&sc->sc_lock);
return (EINVAL);
}
+ if (is->is_connected) {
+ /*
+ * This might have happened because another iscsid(8)
+ * instance handed off the connection in the meantime.
+ * Just return.
+ */
+ ISCSI_SESSION_WARN(is, "handoff on already connected "
+ "session");
+ ISCSI_SESSION_UNLOCK(is);
+ sx_sunlock(&sc->sc_lock);
+ return (EBUSY);
+ }
strlcpy(is->is_target_alias, handoff->idh_target_alias,
sizeof(is->is_target_alias));