From owner-svn-src-projects@FreeBSD.ORG  Sun Aug 21 18:23:10 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6DD4B1065676;
	Sun, 21 Aug 2011 18:23:10 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 13BAB8FC15;
	Sun, 21 Aug 2011 18:23:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7LIN9Do014481;
	Sun, 21 Aug 2011 18:23:09 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7LIN9i8014479;
	Sun, 21 Aug 2011 18:23:09 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201108211823.p7LIN9i8014479@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 21 Aug 2011 18:23:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225064 - projects/zfsd/head/sys/cam/scsi
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Aug 2011 18:23:10 -0000

Author: mav
Date: Sun Aug 21 18:23:09 2011
New Revision: 225064
URL: http://svn.freebsd.org/changeset/base/225064

Log:
  Do not delay boot if we are not going to run daemon process. Otherwise
  boot will wait infinitely.

Modified:
  projects/zfsd/head/sys/cam/scsi/scsi_enc.c

Modified: projects/zfsd/head/sys/cam/scsi/scsi_enc.c
==============================================================================
--- projects/zfsd/head/sys/cam/scsi/scsi_enc.c	Sun Aug 21 16:38:16 2011	(r225063)
+++ projects/zfsd/head/sys/cam/scsi/scsi_enc.c	Sun Aug 21 18:23:09 2011	(r225064)
@@ -940,9 +940,11 @@ enc_ctor(struct cam_periph *periph, void
 	 * through our state machine so that physical path data is
 	 * present.
 	 */
-	enc->enc_boot_hold_ch.ich_func = enc_nop_confighook_cb;
-	enc->enc_boot_hold_ch.ich_arg = enc;
-	config_intrhook_establish(&enc->enc_boot_hold_ch);
+	if (enc->enc_vec.poll_status != NULL) {
+		enc->enc_boot_hold_ch.ich_func = enc_nop_confighook_cb;
+		enc->enc_boot_hold_ch.ich_arg = enc;
+		config_intrhook_establish(&enc->enc_boot_hold_ch);
+	}
 
 	/*
 	 * The softc field is set only once the enc is fully initialized