Coverity fixes for r300906

lib/libdevdctl/consumer.cc
	In Consumer::DisconnectFromDevd, don't close the socket if it's
	already closed.

cddl/usr.sbin/zfsd/case_file.cc
lib/libdevdctl/consumer.h
	Delete dead code leftover from before devd(8) gained SOCK_SEQPACKET
	support

Reported by:	Coverity
CID:		1356155, 1356169
Sponsored by:	Spectra Logic Corp

2 files changed, 3 insertions, 15 deletions

diff --git a/lib/libdevdctl/consumer.cc b/lib/libdevdctl/consumer.cc
index 6b9822e..e769894 100644
--- a/lib/libdevdctl/consumer.cc
+++ b/lib/libdevdctl/consumer.cc
@@ -129,10 +129,10 @@ Consumer::ConnectToDevd()
 void
 Consumer::DisconnectFromDevd()
 {
-	if (m_devdSockFD != -1)
+	if (m_devdSockFD != -1) {
 		syslog(LOG_INFO, "Disconnecting from devd.");
-
-	close(m_devdSockFD);
+		close(m_devdSockFD);
+	}
 	m_devdSockFD = -1;
 }
 
diff --git a/lib/libdevdctl/consumer.h b/lib/libdevdctl/consumer.h
index 721461e..0f15b79 100644
--- a/lib/libdevdctl/consumer.h
+++ b/lib/libdevdctl/consumer.h
@@ -44,8 +44,6 @@ namespace DevdCtl
 
 /*=========================== Forward Declarations ===========================*/
 class Event;
-class EventBuffer;
-class FDReader;
 
 /*============================ Class Declarations ============================*/
 /*----------------------------- DevdCtl::Consumer ----------------------------*/
@@ -139,16 +137,6 @@ protected:
 	 */
 	int                m_devdSockFD;
 
-	/**
-	 * Reader tied to the devd socket.
-	 */
-	FDReader	  *m_reader;
-
-	/**
-	 * Default EventBuffer connected to m_reader.
-	 */
-	EventBuffer	  *m_eventBuffer;
-
 	EventFactory	   m_eventFactory;
 
 	/** Queued events for replay. */