diff options
| author | oster <oster@NetBSD.org> | 2000-09-21 01:45:46 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 2000-09-21 01:45:46 +0000 |
| commit | 3ee0550572233e7fa1c9d834440ea7fdea3c6249 (patch) | |
| tree | ecef127af9c535f9b57cdd80f635f19ab3676532 /sys/dev/raidframe | |
| parent | 014e17fbdc8697d6cc0d190793b02e92eea2eeb2 (diff) | |
convert tsleep()->ltsleep(), which makes the kernel complain less
when compiled with LOCKDEBUG.
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_driver.c | 5 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_mcpair.h | 4 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_revent.c | 11 |
3 files changed, 12 insertions, 8 deletions
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c index e3f8c0434ec..39c86da81ee 100644 --- a/sys/dev/raidframe/rf_driver.c +++ b/sys/dev/raidframe/rf_driver.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_driver.c,v 1.37 2000/06/04 02:05:13 oster Exp $ */ +/* $NetBSD: rf_driver.c,v 1.38 2000/09/21 01:45:46 oster Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -142,7 +142,8 @@ RF_DECLARE_MUTEX(rf_printf_mutex) /* debug only: avoids interleaved #define SIGNAL_QUIESCENT_COND(_raid_) wakeup(&((_raid_)->accesses_suspended)) #define WAIT_FOR_QUIESCENCE(_raid_) \ - tsleep(&((_raid_)->accesses_suspended),PRIBIO,"raidframe quiesce", 0); + ltsleep(&((_raid_)->accesses_suspended), PRIBIO, \ + "raidframe quiesce", 0, &((_raid_)->access_suspend_mutex)) #define IO_BUF_ERR(bp, err) { \ bp->b_flags |= B_ERROR; \ diff --git a/sys/dev/raidframe/rf_mcpair.h b/sys/dev/raidframe/rf_mcpair.h index a0dd0477114..fdd787037c5 100644 --- a/sys/dev/raidframe/rf_mcpair.h +++ b/sys/dev/raidframe/rf_mcpair.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_mcpair.h,v 1.5 2000/09/11 02:23:14 oster Exp $ */ +/* $NetBSD: rf_mcpair.h,v 1.6 2000/09/21 01:45:46 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -43,7 +43,7 @@ struct RF_MCPair_s { RF_MCPair_t *next; }; #define RF_WAIT_MCPAIR(_mcp) \ - tsleep(&((_mcp)->cond), PRIBIO, "mcpair", 0) + ltsleep(&((_mcp)->cond), PRIBIO, "mcpair", 0, &((_mcp)->mutex)) int rf_ConfigureMCPair(RF_ShutdownList_t ** listp); RF_MCPair_t *rf_AllocMCPair(void); diff --git a/sys/dev/raidframe/rf_revent.c b/sys/dev/raidframe/rf_revent.c index 7db3a417799..525b10e5817 100644 --- a/sys/dev/raidframe/rf_revent.c +++ b/sys/dev/raidframe/rf_revent.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_revent.c,v 1.8 2000/09/11 00:22:45 oster Exp $ */ +/* $NetBSD: rf_revent.c,v 1.9 2000/09/21 01:45:46 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -50,7 +50,8 @@ static RF_FreeList_t *rf_revent_freelist; #include <sys/kernel.h> #define DO_WAIT(_rc) \ - tsleep(&(_rc)->eventQueue, PRIBIO, "raidframe eventq", 0) + ltsleep(&(_rc)->eventQueue, PRIBIO, "raidframe eventq", \ + 0, &((_rc)->eq_mutex)) #define DO_SIGNAL(_rc) wakeup(&(_rc)->eventQueue) @@ -141,8 +142,10 @@ rf_GetNextReconEvent(reconDesc, row, continueFunc, continueArg) #if RF_RECON_STATS > 0 reconDesc->numReconExecDelays++; #endif /* RF_RECON_STATS > 0 */ - status = tsleep(&reconDesc->reconExecTicks, - PRIBIO, "recon delay", RECON_TIMO); + + status = ltsleep(&reconDesc->reconExecTicks, PRIBIO, + "recon delay", RECON_TIMO, + &rctrl->eq_mutex); RF_ASSERT(status == EWOULDBLOCK); reconDesc->reconExecTicks = 0; } |
