Date: Tue, 6 Feb 2007 00:31:47 GMT From: Scott Long <scottl@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 114080 for review Message-ID: <200702060031.l160VlvH091200@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=114080 Change 114080 by scottl@scottl-x64 on 2007/02/06 00:31:27 Remove the malloc_flags argument from cam_sim_alloc. It was unsightly and not really needed. Clean up xpt_attach() to compensate. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#9 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#8 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#49 edit .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#11 edit .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/advansys/adwcam.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/aha/aha.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahb/ahb.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic/aic.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#12 edit .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/amd/amd.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/amr/amr_cam.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/asr/asr.c#10 edit .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#8 edit .. //depot/projects/scottl-camlock/src/sys/dev/buslogic/bt.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#12 edit .. //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_scsi.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/esp/ncr53c9x.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp_targ.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/hptmv/entry.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#17 edit .. //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#19 edit .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#5 edit .. //depot/projects/scottl-camlock/src/sys/dev/rr232x/osm_bsd.c#4 edit .. //depot/projects/scottl-camlock/src/sys/dev/sym/sym_hipd.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/trm/trm.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_cam.c#7 edit .. //depot/projects/scottl-camlock/src/sys/dev/usb/umass.c#12 edit .. //depot/projects/scottl-camlock/src/sys/dev/wds/wd7000.c#6 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.c#9 (text+ko) ==== @@ -60,7 +60,7 @@ struct cam_sim * cam_sim_alloc(sim_action_func sim_action, sim_poll_func sim_poll, const char *sim_name, void *softc, u_int32_t unit, - struct mtx *mtx, int malloc_flags, int max_dev_transactions, + struct mtx *mtx, int max_dev_transactions, int max_tagged_dev_transactions, struct cam_devq *queue) { struct cam_sim *sim; @@ -69,7 +69,7 @@ return (NULL); sim = (struct cam_sim *)malloc(sizeof(struct cam_sim), - M_CAMSIM, malloc_flags); + M_CAMSIM, M_NOWAIT); if (sim == NULL) return (NULL); ==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#8 (text+ko) ==== @@ -57,7 +57,6 @@ void *softc, u_int32_t unit, struct mtx *mtx, - int malloc_flags, int max_dev_transactions, int max_tagged_dev_transactions, struct cam_devq *queue); ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#49 (text+ko) ==== @@ -746,7 +746,7 @@ NULL }; -static void xpt_init(void *); +static int xpt_init(void *); DECLARE_MODULE(cam, cam_moduledata, SI_SUB_CONFIGURE, SI_ORDER_SECOND); MODULE_VERSION(cam, 1); @@ -1387,11 +1387,16 @@ static int cam_module_event_handler(module_t mod, int what, void *arg) { - if (what == MOD_LOAD) { - xpt_init(NULL); - } else if (what == MOD_UNLOAD) { + int error; + + switch (what) { + case MOD_LOAD: + if ((error = xpt_init(NULL)) != 0) + return (error); + break; + case MOD_UNLOAD: return EBUSY; - } else { + default: return EOPNOTSUPP; } @@ -1399,7 +1404,7 @@ } /* Functions accessed by the peripheral drivers */ -static void +static int xpt_init(dummy) void *dummy; { @@ -1429,16 +1434,18 @@ /*softc*/NULL, /*unit*/0, /*mtx*/&Giant, - /*flags*/M_WAITOK, /*max_dev_transactions*/0, /*max_tagged_dev_transactions*/0, devq); + if (xpt_sim == NULL) + return (ENOMEM); + xpt_sim->max_ccbs = 16; if ((status = xpt_bus_register(xpt_sim, /*bus #*/0)) != CAM_SUCCESS) { printf("xpt_init: xpt_bus_register failed with status %#x," " failing attach\n", status); - return; + return (EINVAL); } /* @@ -1451,7 +1458,7 @@ CAM_LUN_WILDCARD)) != CAM_REQ_CMP) { printf("xpt_init: xpt_create_path failed with status %#x," " failing attach\n", status); - return; + return (EINVAL); } cam_periph_alloc(xptregister, NULL, NULL, NULL, "xpt", CAM_PERIPH_BIO, @@ -1467,7 +1474,7 @@ if (xsoftc.xpt_config_hook == NULL) { printf("xpt_init: Cannot malloc config hook " "- failing attach\n"); - return; + return (ENOMEM); } xsoftc.xpt_config_hook->ich_func = xpt_config; @@ -1479,6 +1486,8 @@ /* Install our software interrupt handlers */ swi_add(NULL, "cambio", camisr, &cam_bioq, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih); + + return (0); } static cam_status ==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#11 (text+ko) ==== @@ -1343,8 +1343,7 @@ slp->sl_si.sim = cam_sim_alloc(scsi_low_scsi_action_cam, scsi_low_poll_cam, DEVPORT_DEVNAME(slp->sl_dev), slp, - DEVPORT_DEVUNIT(slp->sl_dev), - &Giant, M_NOWAIT, + DEVPORT_DEVUNIT(slp->sl_dev), &Giant, slp->sl_openings, tagged_openings, devq); if (slp->sl_si.sim == NULL) { ==== //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#9 (text+ko) ==== @@ -171,7 +171,7 @@ return (EIO); sim = cam_sim_alloc(aac_cam_action, aac_cam_poll, "aacp", camsc, - device_get_unit(dev), &Giant, M_NOWAIT, 1, 1, devq); + device_get_unit(dev), &Giant, 1, 1, devq); if (sim == NULL) { cam_simq_free(devq); return (EIO); ==== //depot/projects/scottl-camlock/src/sys/dev/advansys/advansys.c#9 (text+ko) ==== @@ -1414,7 +1414,7 @@ * Construct our SIM entry. */ adv->sim = cam_sim_alloc(adv_action, adv_poll, "adv", adv, adv->unit, - &Giant, M_NOWAIT, 1, adv->max_openings, devq); + &Giant, 1, adv->max_openings, devq); if (adv->sim == NULL) return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/advansys/adwcam.c#8 (text+ko) ==== ==== //depot/projects/scottl-camlock/src/sys/dev/aha/aha.c#7 (text+ko) ==== @@ -606,7 +606,7 @@ * Construct our SIM entry */ aha->sim = cam_sim_alloc(ahaaction, ahapoll, "aha", aha, aha->unit, - &Giant, M_NOWAIT, 2, tagged_dev_openings, devq); + &Giant, 2, tagged_dev_openings, devq); if (aha->sim == NULL) { cam_simq_free(devq); return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/ahb/ahb.c#8 (text+ko) ==== @@ -550,7 +550,7 @@ * Construct our SIM entry */ ahb->sim = cam_sim_alloc(ahbaction, ahbpoll, "ahb", ahb, ahb->unit, - &Giant, M_NOWAIT, 2, ahb->num_ecbs, devq); + &Giant, 2, ahb->num_ecbs, devq); if (ahb->sim == NULL) { cam_simq_free(devq); return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/aic/aic.c#5 (text+ko) ==== @@ -1543,7 +1543,7 @@ * Construct our SIM entry */ aic->sim = cam_sim_alloc(aic_action, aic_poll, "aic", aic, - aic->unit, &Giant, M_NOWAIT, 2, 256, devq); + aic->unit, &Giant, 2, 256, devq); if (aic->sim == NULL) { cam_simq_free(devq); return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic79xx_osm.c#12 (text+ko) ==== @@ -147,7 +147,7 @@ */ sim = cam_sim_alloc(ahd_action, ahd_poll, "ahd", ahd, device_get_unit(ahd->dev_softc), - &ahd->platform_data->mtx, M_NOWAIT, 1, /*XXX*/256, devq); + &ahd->platform_data->mtx, 1, /*XXX*/256, devq); if (sim == NULL) { cam_simq_free(devq); goto fail; ==== //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aic7xxx_osm.c#9 (text+ko) ==== @@ -196,7 +196,7 @@ */ sim = cam_sim_alloc(ahc_action, ahc_poll, "ahc", ahc, device_get_unit(ahc->dev_softc), - &Giant, M_NOWAIT, 1, AHC_MAX_QUEUE, devq); + &Giant, 1, AHC_MAX_QUEUE, devq); if (sim == NULL) { cam_simq_free(devq); goto fail; @@ -228,8 +228,7 @@ if (ahc->features & AHC_TWIN) { sim2 = cam_sim_alloc(ahc_action, ahc_poll, "ahc", ahc, device_get_unit(ahc->dev_softc), - &Giant, M_NOWAIT, 1, - AHC_MAX_QUEUE, devq); + &Giant, 1, AHC_MAX_QUEUE, devq); if (sim2 == NULL) { printf("ahc_attach: Unable to attach second " ==== //depot/projects/scottl-camlock/src/sys/dev/amd/amd.c#8 (text+ko) ==== @@ -2482,7 +2482,7 @@ } amd->psim = cam_sim_alloc(amd_action, amd_poll, "amd", - amd, amd->unit, &Giant, M_NOWAIT, + amd, amd->unit, &Giant, 1, MAX_TAGS_CMD_QUEUE, devq); if (amd->psim == NULL) { cam_simq_free(devq); ==== //depot/projects/scottl-camlock/src/sys/dev/amr/amr_cam.c#7 (text+ko) ==== @@ -149,7 +149,6 @@ sc, device_get_unit(sc->amr_dev), &Giant, - M_NOWAIT, 1, AMR_MAX_SCSI_CMDS, devq)) == NULL) { ==== //depot/projects/scottl-camlock/src/sys/dev/arcmsr/arcmsr.c#8 (text+ko) ==== @@ -2134,8 +2134,8 @@ printf("arcmsr%d: cam_simq_alloc failure!\n", unit); return ENXIO; } - acb->psim=cam_sim_alloc(arcmsr_action, arcmsr_poll - , "arcmsr", acb, unit, &Giant, M_NOWAIT, 1, + acb->psim=cam_sim_alloc(arcmsr_action, arcmsr_poll, + "arcmsr", acb, unit, &Giant, 1, ARCMSR_MAX_OUTSTANDING_CMD, devq); if(acb->psim == NULL) { arcmsr_free_resource(acb); ==== //depot/projects/scottl-camlock/src/sys/dev/asr/asr.c#10 (text+ko) ==== @@ -2651,7 +2651,7 @@ * Construct our first channel SIM entry */ sc->ha_sim[bus] = cam_sim_alloc(asr_action, asr_poll, "asr", sc, - unit, &Giant, M_NOWAIT, + unit, &Giant, 1, QueueSize, devq); if (sc->ha_sim[bus] == NULL) { continue; ==== //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#8 (text+ko) ==== @@ -210,7 +210,7 @@ } if ((sim = cam_sim_alloc(atapi_action, atapi_poll, "ata", - (void *)scp, unit, &Giant, M_NOWAIT, 1, 1, devq)) == NULL) { + (void *)scp, unit, &Giant, 1, 1, devq)) == NULL) { error = ENOMEM; goto out; } ==== //depot/projects/scottl-camlock/src/sys/dev/buslogic/bt.c#7 (text+ko) ==== @@ -874,7 +874,7 @@ * Construct our SIM entry */ bt->sim = cam_sim_alloc(btaction, btpoll, "bt", bt, bt->unit, - &Giant, M_NOWAIT, 2, tagged_dev_openings, devq); + &Giant, 2, tagged_dev_openings, devq); if (bt->sim == NULL) { cam_simq_free(devq); return (ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#12 (text+ko) ==== @@ -2476,7 +2476,7 @@ if ((sc->ciss_cam_sim[i] = cam_sim_alloc(ciss_cam_action, ciss_cam_poll, "ciss", sc, device_get_unit(sc->ciss_dev), - &Giant, M_NOWAIT, 1, + &Giant, 1, sc->ciss_max_requests - 2, sc->ciss_cam_devq)) == NULL) { ciss_printf(sc, "can't allocate CAM SIM for controller %d\n", i); @@ -2499,7 +2499,7 @@ if ((sc->ciss_cam_sim[i] = cam_sim_alloc(ciss_cam_action, ciss_cam_poll, "ciss", sc, device_get_unit(sc->ciss_dev), - &Giant, M_NOWAIT, 1, + &Giant, 1, sc->ciss_max_requests - 2, sc->ciss_cam_devq)) == NULL) { ciss_printf(sc, "can't allocate CAM SIM for controller %d\n", i); ==== //depot/projects/scottl-camlock/src/sys/dev/dpt/dpt_scsi.c#9 (text+ko) ==== @@ -1567,7 +1567,7 @@ */ dpt->sims[i] = cam_sim_alloc(dpt_action, dpt_poll, "dpt", dpt, dpt->unit, &Giant, - M_NOWAIT, /*untagged*/2, + /*untagged*/2, /*tagged*/dpt->max_dccbs, devq); if (dpt->sims[i] == NULL) { if (i == 0) ==== //depot/projects/scottl-camlock/src/sys/dev/esp/ncr53c9x.c#7 (text+ko) ==== @@ -325,7 +325,7 @@ } sim = cam_sim_alloc(ncr53c9x_action, ncr53c9x_poll, "esp", sc, - device_get_unit(sc->sc_dev), &Giant, M_NOWAIT, 1, + device_get_unit(sc->sc_dev), &Giant, 1, NCR_TAG_DEPTH, devq); if (sim == NULL) { device_printf(sc->sc_dev, "cannot allocate SIM entry\n"); ==== //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp.c#7 (text+ko) ==== @@ -1960,7 +1960,7 @@ sbp->sim = cam_sim_alloc(sbp_action, sbp_poll, "sbp", sbp, device_get_unit(dev), - &Giant, M_NOWAIT, + &Giant, /*untagged*/ 1, /*tagged*/ SBP_QUEUE_LEN - 1, devq); ==== //depot/projects/scottl-camlock/src/sys/dev/firewire/sbp_targ.c#5 (text+ko) ==== @@ -1627,7 +1627,7 @@ return (ENXIO); sc->sim = cam_sim_alloc(sbp_targ_action, sbp_targ_poll, - "sbp_targ", sc, device_get_unit(dev), &Giant, M_NOWAIT, + "sbp_targ", sc, device_get_unit(dev), &Giant, /*untagged*/ 1, /*tagged*/ 1, devq); if (sc->sim == NULL) { cam_simq_free(devq); ==== //depot/projects/scottl-camlock/src/sys/dev/hptmv/entry.c#7 (text+ko) ==== @@ -1961,7 +1961,7 @@ */ if ((hpt_vsim = cam_sim_alloc(hpt_action, hpt_poll, __str(PROC_DIR_NAME), pAdapter, device_get_unit(pAdapter->hpt_dev), - &Giant, M_NOWAIT, /*untagged*/1, /*tagged*/8, devq)) == NULL) { + &Giant, /*untagged*/1, /*tagged*/8, devq)) == NULL) { cam_simq_free(devq); return ENOMEM; } ==== //depot/projects/scottl-camlock/src/sys/dev/iir/iir.c#9 (text+ko) ==== @@ -503,7 +503,7 @@ */ gdt->sims[i] = cam_sim_alloc(iir_action, iir_poll, "iir", gdt, gdt->sc_hanum, &Giant, - M_NOWAIT, /*untagged*/1, + /*untagged*/1, /*tagged*/GDT_MAXCMDS, devq); if (xpt_bus_register(gdt->sims[i], i) != CAM_SUCCESS) { cam_sim_free(gdt->sims[i], /*free_devq*/i == 0); ==== //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#17 (text+ko) ==== @@ -136,8 +136,7 @@ */ ISPLOCK_2_CAMLOCK(isp); sim = cam_sim_alloc(isp_action, isp_poll, "isp", isp, - device_get_unit(isp->isp_dev), &Giant, M_NOWAIT, 1, - isp->isp_maxcmds, devq); + device_get_unit(isp->isp_dev), &Giant, 1, isp->isp_maxcmds, devq); if (sim == NULL) { cam_simq_free(devq); CAMLOCK_2_ISPLOCK(isp); @@ -224,7 +223,7 @@ if (IS_DUALBUS(isp)) { ISPLOCK_2_CAMLOCK(isp); sim = cam_sim_alloc(isp_action, isp_poll, "isp", isp, - device_get_unit(isp->isp_dev), &Giant, M_NOWAIT, 1, + device_get_unit(isp->isp_dev), &Giant, 1, isp->isp_maxcmds, devq); if (sim == NULL) { xpt_bus_deregister(cam_sim_path(isp->isp_sim)); ==== //depot/projects/scottl-camlock/src/sys/dev/mly/mly.c#7 (text+ko) ==== @@ -1945,7 +1945,7 @@ if ((sc->mly_cam_sim[chn] = cam_sim_alloc(mly_cam_action, mly_cam_poll, "mly", sc, device_get_unit(sc->mly_dev), - &Giant, M_NOWAIT, + &Giant, sc->mly_controllerinfo->maximum_parallel_commands, 1, devq)) == NULL) { return(ENOMEM); @@ -1965,7 +1965,7 @@ for (i = 0; i < sc->mly_controllerinfo->virtual_channels_present; i++, chn++) { if ((sc->mly_cam_sim[chn] = cam_sim_alloc(mly_cam_action, mly_cam_poll, "mly", sc, device_get_unit(sc->mly_dev), - &Giant, M_NOWAIT, + &Giant, sc->mly_controllerinfo->maximum_parallel_commands, 0, devq)) == NULL) { return(ENOMEM); ==== //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#19 (text+ko) ==== @@ -318,7 +318,7 @@ * Construct our SIM entry. */ mpt->sim = cam_sim_alloc(mpt_action, mpt_poll, "mpt", mpt, - mpt->unit, &mpt->mpt_lock, M_NOWAIT, 1, maxq, devq); + mpt->unit, &mpt->mpt_lock, 1, maxq, devq); if (mpt->sim == NULL) { mpt_prt(mpt, "Unable to allocate CAM SIM!\n"); cam_simq_free(devq); @@ -358,7 +358,7 @@ * Create a "bus" to export all hidden disks to CAM. */ mpt->phydisk_sim = cam_sim_alloc(mpt_action, mpt_poll, "mpt", mpt, - mpt->unit, &mpt->mpt_lock, M_NOWAIT, 1, maxq, devq); + mpt->unit, &mpt->mpt_lock, 1, maxq, devq); if (mpt->phydisk_sim == NULL) { mpt_prt(mpt, "Unable to allocate Physical Disk CAM SIM!\n"); error = ENOMEM; ==== //depot/projects/scottl-camlock/src/sys/dev/ppbus/vpo.c#5 (text+ko) ==== @@ -162,8 +162,7 @@ return (ENXIO); vpo->sim = cam_sim_alloc(vpo_action, vpo_poll, "vpo", vpo, - device_get_unit(dev), - &Giant, M_NOWAIT, + device_get_unit(dev), &Giant, /*untagged*/1, /*tagged*/0, devq); if (vpo->sim == NULL) { cam_simq_free(devq); ==== //depot/projects/scottl-camlock/src/sys/dev/rr232x/osm_bsd.c#4 (text) ==== @@ -1088,7 +1088,7 @@ } vbus_ext->sim = cam_sim_alloc(hpt_action, hpt_poll, driver_name, - vbus_ext, 0, &Giant, M_NOWAIT, + vbus_ext, 0, &Giant, os_max_queue_comm, /*tagged*/8, devq); if (!vbus_ext->sim) { ==== //depot/projects/scottl-camlock/src/sys/dev/sym/sym_hipd.c#9 (text+ko) ==== @@ -8973,7 +8973,7 @@ * Construct our SIM entry. */ sim = cam_sim_alloc(sym_action, sym_poll, "sym", np, np->unit, - &Giant, M_NOWAIT, 1, SYM_SETUP_MAX_TAG, devq); + &Giant, 1, SYM_SETUP_MAX_TAG, devq); if (!sim) goto fail; devq = 0; ==== //depot/projects/scottl-camlock/src/sys/dev/trm/trm.c#9 (text+ko) ==== @@ -3637,7 +3637,6 @@ pACB, unit, &Giant, - M_NOWAIT, 1, TRM_MAX_TAGS_CMD_QUEUE, device_Q); ==== //depot/projects/scottl-camlock/src/sys/dev/twa/tw_osl_cam.c#7 (text+ko) ==== @@ -102,7 +102,7 @@ */ tw_osli_dbg_dprintf(3, sc, "Calling cam_sim_alloc"); sc->sim = cam_sim_alloc(twa_action, twa_poll, "twa", sc, - device_get_unit(sc->bus_dev), &Giant, M_NOWAIT, + device_get_unit(sc->bus_dev), &Giant, TW_OSLI_MAX_NUM_IOS - 1, 1, devq); if (sc->sim == NULL) { cam_simq_free(devq); ==== //depot/projects/scottl-camlock/src/sys/dev/usb/umass.c#12 (text+ko) ==== @@ -2251,7 +2251,7 @@ DEVNAME_SIM, sc /*priv*/, device_get_unit(sc->sc_dev) /*unit number*/, - &Giant, M_NOWAIT, + &Giant, 1 /*maximum device openings*/, 0 /*maximum tagged device openings*/, devq); ==== //depot/projects/scottl-camlock/src/sys/dev/wds/wd7000.c#6 (text+ko) ==== @@ -607,7 +607,7 @@ goto bad; sim = cam_sim_alloc(wds_action, wds_poll, "wds", (void *) wp, - wp->unit, &Giant, M_NOWAIT, 1, 1, devq); + wp->unit, &Giant, 1, 1, devq); if (sim == NULL) { cam_simq_free(devq); goto bad;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702060031.l160VlvH091200>