54c54
< __FBSDID("$FreeBSD: head/sys/dev/mfi/mfi.c 233711 2012-03-30 23:05:48Z ambrisko $");
---
> __FBSDID("$FreeBSD: head/sys/dev/mfi/mfi.c 235014 2012-05-04 16:00:39Z ambrisko $");
93,94d92
< static int mfi_dcmd_command(struct mfi_softc *, struct mfi_command **,
< uint32_t, void **, size_t);
379a378
> TASK_INIT(&sc->mfi_map_sync_task, 0, mfi_handle_map_sync, sc);
699d697
< sc->map_id = 0;
764a763,766
> if (sc->mfi_flags & MFI_FLAGS_TBOLT) {
> mfi_tbolt_sync_map_info(sc);
> }
>
848c850
< static int
---
> int
1289,1290c1291,1292
< if (sc->map_update_cmd != NULL)
< mfi_abort(sc, sc->map_update_cmd);
---
> if (sc->mfi_map_sync_cm != NULL)
> mfi_abort(sc, sc->mfi_map_sync_cm);
1667c1669
< if (sc->mfi_aen_cm->cm_aen_abort ||
---
> if (sc->cm_aen_abort ||
1669c1671
< sc->mfi_aen_cm->cm_aen_abort = 0;
---
> sc->cm_aen_abort = 0;
2388c2390,2392
< sc->mfi_aen_cm->cm_aen_abort = 1;
---
> sc->cm_aen_abort = 1;
> if (sc->mfi_map_sync_cm)
> sc->cm_map_abort = 1;
2396a2401,2405
> while (i < 5 && sc->mfi_map_sync_cm != NULL) {
> msleep(&sc->mfi_map_sync_cm, &sc->mfi_io_lock, 0, "mfiabort",
> 5 * hz);
> i++;
> }
3552c3561
< if (sc->mfi_aen_cm == cm)
---
> if (sc->mfi_aen_cm == cm || sc->mfi_map_sync_cm == cm)
3554c3563
< if ((sc->mfi_aen_cm != cm) && (cm->cm_timestamp < deadline)) {
---
> if (cm->cm_timestamp < deadline) {