svn commit: r225064 - projects/zfsd/head/sys/cam/scsi

Alexander Motin mav at FreeBSD.org
Sun Aug 21 18:23:10 UTC 2011


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


More information about the svn-src-projects mailing list