Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 7 May 2014 07:45:22 +0000 (UTC)
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r265520 - stable/10/sys/dev/iscsi
Message-ID:  <201405070745.s477jMp7025111@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: trasz
Date: Wed May  7 07:45:22 2014
New Revision: 265520
URL: http://svnweb.freebsd.org/changeset/base/265520

Log:
  MFC r264536:
  
  Get rid of ISCSIDCLOSE; it wasn't used and is redundant anyway,
  because of ISCSIDFAIL.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/sys/dev/iscsi/iscsi.c
  stable/10/sys/dev/iscsi/iscsi_ioctl.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/iscsi/iscsi.c
==============================================================================
--- stable/10/sys/dev/iscsi/iscsi.c	Wed May  7 07:44:17 2014	(r265519)
+++ stable/10/sys/dev/iscsi/iscsi.c	Wed May  7 07:45:22 2014	(r265520)
@@ -1551,28 +1551,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
@@ -1803,9 +1781,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: stable/10/sys/dev/iscsi/iscsi_ioctl.h
==============================================================================
--- stable/10/sys/dev/iscsi/iscsi_ioctl.h	Wed May  7 07:44:17 2014	(r265519)
+++ stable/10/sys/dev/iscsi/iscsi_ioctl.h	Wed May  7 07:45:22 2014	(r265520)
@@ -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 */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405070745.s477jMp7025111>