diff options
author | trasz <trasz@FreeBSD.org> | 2014-05-07 07:45:22 +0000 |
---|---|---|
committer | trasz <trasz@FreeBSD.org> | 2014-05-07 07:45:22 +0000 |
commit | 6dac0bfb6895c34e176675fa57bd197cf9c72d1b (patch) | |
tree | 1c1421e408fbb827df8d1361712998dd0f82c781 | |
parent | 4dda47a3faae36eb1a81987008dca9a3d1626beb (diff) | |
download | FreeBSD-src-6dac0bfb6895c34e176675fa57bd197cf9c72d1b.zip FreeBSD-src-6dac0bfb6895c34e176675fa57bd197cf9c72d1b.tar.gz |
MFC r264536:
Get rid of ISCSIDCLOSE; it wasn't used and is redundant anyway,
because of ISCSIDFAIL.
Sponsored by: The FreeBSD Foundation
-rw-r--r-- | sys/dev/iscsi/iscsi.c | 25 | ||||
-rw-r--r-- | sys/dev/iscsi/iscsi_ioctl.h | 6 |
2 files changed, 0 insertions, 31 deletions
diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c index 6b93e41..33ce181 100644 --- a/sys/dev/iscsi/iscsi.c +++ b/sys/dev/iscsi/iscsi.c @@ -1551,28 +1551,6 @@ iscsi_ioctl_daemon_receive(struct iscsi_softc *sc, return (0); } - -static int -iscsi_ioctl_daemon_close(struct iscsi_softc *sc, - struct iscsi_daemon_close *idc) -{ - struct iscsi_session *is; - - sx_slock(&sc->sc_lock); - TAILQ_FOREACH(is, &sc->sc_sessions, is_next) { - if (is->is_id == idc->idc_session_id) - break; - } - if (is == NULL) { - sx_sunlock(&sc->sc_lock); - return (ESRCH); - } - sx_sunlock(&sc->sc_lock); - - iscsi_session_reconnect(is); - - return (0); -} #endif /* ICL_KERNEL_PROXY */ static void @@ -1803,9 +1781,6 @@ iscsi_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int mode, case ISCSIDRECEIVE: return (iscsi_ioctl_daemon_receive(sc, (struct iscsi_daemon_receive *)arg)); - case ISCSIDCLOSE: - return (iscsi_ioctl_daemon_close(sc, - (struct iscsi_daemon_close *)arg)); #endif /* ICL_KERNEL_PROXY */ case ISCSISADD: return (iscsi_ioctl_session_add(sc, diff --git a/sys/dev/iscsi/iscsi_ioctl.h b/sys/dev/iscsi/iscsi_ioctl.h index f5888c2..ae848af 100644 --- a/sys/dev/iscsi/iscsi_ioctl.h +++ b/sys/dev/iscsi/iscsi_ioctl.h @@ -175,15 +175,9 @@ struct iscsi_daemon_receive { int idr_spare[4]; }; -struct iscsi_daemon_close { - int idc_session_id; - int idc_spare[4]; -}; - #define ISCSIDCONNECT _IOWR('I', 0x04, struct iscsi_daemon_connect) #define ISCSIDSEND _IOWR('I', 0x05, struct iscsi_daemon_send) #define ISCSIDRECEIVE _IOWR('I', 0x06, struct iscsi_daemon_receive) -#define ISCSIDCLOSE _IOWR('I', 0x07, struct iscsi_daemon_close) #endif /* ICL_KERNEL_PROXY */ |