diff options
| author | Peter Galbavy <peter@cvs.openbsd.org> | 2000-01-08 20:57:14 +0000 |
|---|---|---|
| committer | Peter Galbavy <peter@cvs.openbsd.org> | 2000-01-08 20:57:14 +0000 |
| commit | 044607b6cf8a6b0f7d82eab78c63098e49c31e51 (patch) | |
| tree | 9033957523380e8ada1491cc2726a0263920ff1a /sys | |
| parent | 37c25b9da2367267a94a233739ce3efcafdc0c0e (diff) | |
sync with NetBSD
- remove unused are from IO_BUF_ERR in rf_driver.c
- remove unused define in rf_stripelocks.c
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/raidframe/rf_driver.c | 10 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_stripelocks.c | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c index 31ff4827589..d097336676d 100644 --- a/sys/dev/raidframe/rf_driver.c +++ b/sys/dev/raidframe/rf_driver.c @@ -1,5 +1,5 @@ -/* $OpenBSD: rf_driver.c,v 1.6 2000/01/07 14:50:21 peter Exp $ */ -/* $NetBSD: rf_driver.c,v 1.19 1999/12/07 02:54:08 oster Exp $ */ +/* $OpenBSD: rf_driver.c,v 1.7 2000/01/08 20:57:12 peter Exp $ */ +/* $NetBSD: rf_driver.c,v 1.20 2000/01/07 03:03:44 oster Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -159,7 +159,7 @@ RF_DECLARE_GLOBAL_THREADID /* declarations for threadid.h */ #define WAIT_FOR_QUIESCENCE(_raid_) \ tsleep(&((_raid_)->accesses_suspended),PRIBIO,"raidframe quiesce", 0); -#define IO_BUF_ERR(bp, err, unit) { \ +#define IO_BUF_ERR(bp, err) { \ bp->b_flags |= B_ERROR; \ bp->b_resid = bp->b_bcount; \ bp->b_error = err; \ @@ -699,7 +699,7 @@ bp_in is a buf pointer. void * to facilitate ignoring it outside the kernel if (!raidPtr->valid) { RF_ERRORMSG("RAIDframe driver not successfully configured. Rejecting access.\n"); - IO_BUF_ERR(bp, EINVAL, raidPtr->raidid); + IO_BUF_ERR(bp, EINVAL); return (EINVAL); } @@ -722,7 +722,7 @@ bp_in is a buf pointer. void * to facilitate ignoring it outside the kernel printf("DoAccess: raid addr %lu too large to access %lu sectors. Max legal addr is %lu\n", (u_long) raidAddress, (u_long) numBlocks, (u_long) raidPtr->totalSectors); - IO_BUF_ERR(bp, ENOSPC, raidPtr->raidid); + IO_BUF_ERR(bp, ENOSPC); return (ENOSPC); } desc = rf_AllocRaidAccDesc(raidPtr, type, raidAddress, diff --git a/sys/dev/raidframe/rf_stripelocks.c b/sys/dev/raidframe/rf_stripelocks.c index a2e0f4dc81d..e3d35b1caa9 100644 --- a/sys/dev/raidframe/rf_stripelocks.c +++ b/sys/dev/raidframe/rf_stripelocks.c @@ -1,5 +1,5 @@ -/* $OpenBSD: rf_stripelocks.c,v 1.2 1999/02/16 00:03:28 niklas Exp $ */ -/* $NetBSD: rf_stripelocks.c,v 1.3 1999/02/05 00:06:17 oster Exp $ */ +/* $OpenBSD: rf_stripelocks.c,v 1.3 2000/01/08 20:57:13 peter Exp $ */ +/* $NetBSD: rf_stripelocks.c,v 1.4 2000/01/07 03:04:41 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -80,7 +80,6 @@ #define FLUSH #define HASH_STRIPEID(_sid_) ( (_sid_) & (rf_lockTableSize-1) ) -#define MAX_FREELIST 100 static void AddToWaitersQueue(RF_LockTableEntry_t * lockTable, RF_StripeLockDesc_t * lockDesc, RF_LockReqDesc_t * lockReqDesc); static RF_StripeLockDesc_t *AllocStripeLockDesc(RF_StripeNum_t stripeID); |