diff --git a/sys/dev/mpt/mpt_raid.c b/sys/dev/mpt/mpt_raid.c index 201cc0d1a5af..7448572ad981 100644 --- a/sys/dev/mpt/mpt_raid.c +++ b/sys/dev/mpt/mpt_raid.c @@ -112,7 +112,6 @@ static int mpt_spawn_raid_thread(struct mpt_softc *mpt); static void mpt_terminate_raid_thread(struct mpt_softc *mpt); static void mpt_raid_thread(void *arg); static timeout_t mpt_raid_timer; -static timeout_t mpt_raid_quiesce_timeout; #if 0 static void mpt_enable_vol(struct mpt_softc *mpt, struct mpt_raid_volume *mpt_vol, int enable); @@ -724,6 +723,15 @@ mpt_raid_thread(void *arg) kthread_exit(0); } +#if 0 +static void +mpt_raid_quiesce_timeout(void *arg) +{ + /* Complete the CCB with error */ + /* COWWWW */ +} + +static timeout_t mpt_raid_quiesce_timeout; cam_status mpt_raid_quiesce_disk(struct mpt_softc *mpt, struct mpt_raid_disk *mpt_disk, request_t *req) @@ -773,6 +781,7 @@ mpt_raid_quiesce_disk(struct mpt_softc *mpt, struct mpt_raid_disk *mpt_disk, } return (CAM_REQUEUE_REQ); } +#endif /* XXX Ignores that there may be multiple busses/IOCs involved. */ cam_status @@ -1505,13 +1514,6 @@ mpt_raid_timer(void *arg) MPT_UNLOCK(mpt); } -static void -mpt_raid_quiesce_timeout(void *arg) -{ - /* Complete the CCB with error */ - /* COWWWW */ -} - void mpt_schedule_raid_refresh(struct mpt_softc *mpt) { diff --git a/sys/dev/mpt/mpt_raid.h b/sys/dev/mpt/mpt_raid.h index 1bd41018ef9c..bc5aa7dd9fe2 100644 --- a/sys/dev/mpt/mpt_raid.h +++ b/sys/dev/mpt/mpt_raid.h @@ -69,8 +69,10 @@ mpt_issue_raid_req(struct mpt_softc *, struct mpt_raid_volume *, cam_status mpt_map_physdisk(struct mpt_softc *, union ccb *, target_id_t *); int mpt_is_raid_volume(struct mpt_softc *, int); +#if 0 cam_status mpt_raid_quiesce_disk(struct mpt_softc *, struct mpt_raid_disk *, request_t *); +#endif int mpt_refresh_raid_data(struct mpt_softc *); void mpt_schedule_raid_refresh(struct mpt_softc *);