From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 21:05:10 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 452C487F; Mon, 14 Oct 2013 21:05:10 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 32D77283A; Mon, 14 Oct 2013 21:05:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EL5AMF057506; Mon, 14 Oct 2013 21:05:10 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EL5ADG057505; Mon, 14 Oct 2013 21:05:10 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142105.r9EL5ADG057505@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 21:05:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256455 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 21:05:10 -0000 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.");