svn commit: r264536 - head/sys/dev/iscsi
Edward Tomasz Napierala
trasz at FreeBSD.org
Wed Apr 16 11:19:50 UTC 2014
Author: trasz
Date: Wed Apr 16 11:19:49 2014
New Revision: 264536
URL: http://svnweb.freebsd.org/changeset/base/264536
Log:
Get rid of ISCSIDCLOSE; it wasn't used and is redundant anyway,
because of ISCSIDFAIL.
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/dev/iscsi/iscsi.c
head/sys/dev/iscsi/iscsi_ioctl.h
Modified: head/sys/dev/iscsi/iscsi.c
==============================================================================
--- head/sys/dev/iscsi/iscsi.c Wed Apr 16 11:07:29 2014 (r264535)
+++ head/sys/dev/iscsi/iscsi.c Wed Apr 16 11:19:49 2014 (r264536)
@@ -1552,28 +1552,6 @@ iscsi_ioctl_daemon_receive(struct iscsi_
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
@@ -1804,9 +1782,6 @@ iscsi_ioctl(struct cdev *dev, u_long cmd
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,
Modified: head/sys/dev/iscsi/iscsi_ioctl.h
==============================================================================
--- head/sys/dev/iscsi/iscsi_ioctl.h Wed Apr 16 11:07:29 2014 (r264535)
+++ head/sys/dev/iscsi/iscsi_ioctl.h Wed Apr 16 11:19:49 2014 (r264536)
@@ -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 */
More information about the svn-src-all
mailing list