svn commit: r256455 - projects/zfsd/head/cddl/sbin/zfsd

[Alan Somers]

Author: asomers
Date: Mon Oct 14 21:05:09 2013
New Revision: 256455
URL: http://svnweb.freebsd.org/changeset/base/256455

Log:
  cddl/sbin/zfsd/zfsd.cc
  	In ZfsdDaemon::EventsPending(), we do not block waiting for events,
  	so poll will return 0 if no events are pending.  Don't treat this as
  	a fatal error.
  
  Submitted by:	gibbs
  Approved by:	ken (mentor)
  Sponsored by:	Spectra Logic Corporation

Modified:
  projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc

Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc
==============================================================================
--- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc	Mon Oct 14 20:59:17 2013	(r256454)
+++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc	Mon Oct 14 21:05:09 2013	(r256455)
@@ -526,9 +526,6 @@ ZfsDaemon::EventsPending()
 	if (result == -1)
 		err(1, "Polling for devd events failed");
 
-	if (result == 0)
-		errx(1, "Unexpected result of 0 from poll. Exiting");
-
 	if ((fds->revents & POLLERR) != 0)
 		throw ZfsdException("ZfsdDaemon:EventsPending(): "
 				    "POLLERR detected on devd socket.");