diff options
| author | oster <oster@NetBSD.org> | 2000-01-09 00:00:18 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 2000-01-09 00:00:18 +0000 |
| commit | cdb6add0f7ca28b751ed22d041336c6dfe4848d8 (patch) | |
| tree | 1af1a416872c86065591f83fbe42eeb418744070 /sys/dev | |
| parent | 37c75452f46122e132d489fa25b73148e79848e2 (diff) | |
Nuke desc->tid.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/raidframe/rf_desc.h | 4 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_driver.c | 3 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_states.c | 22 |
3 files changed, 15 insertions, 14 deletions
diff --git a/sys/dev/raidframe/rf_desc.h b/sys/dev/raidframe/rf_desc.h index 2be37006784..3ef183c79f4 100644 --- a/sys/dev/raidframe/rf_desc.h +++ b/sys/dev/raidframe/rf_desc.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_desc.h,v 1.4 1999/02/05 00:06:09 oster Exp $ */ +/* $NetBSD: rf_desc.h,v 1.5 2000/01/09 00:00:18 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -93,8 +93,6 @@ struct RF_RaidAccessDesc_s { void (*callbackFunc) (RF_CBParam_t); /* callback function for this * I/O */ void *callbackArg; /* arg to give to callback func */ - int tid; /* debug only, user-level only: thread id of - * thr that did this access */ RF_AllocListElem_t *cleanupList; /* memory to be freed at the * end of the access */ diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c index b4e155127e7..2f46fadaea0 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.22 2000/01/08 22:57:31 oster Exp $ */ +/* $NetBSD: rf_driver.c,v 1.23 2000/01/09 00:00:18 oster Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -642,7 +642,6 @@ rf_AllocRaidAccDesc( desc->numPending = 0; desc->cleanupList = NULL; rf_MakeAllocList(desc->cleanupList); - desc->tid = 0; /* XXX Make this go away */ return (desc); } diff --git a/sys/dev/raidframe/rf_states.c b/sys/dev/raidframe/rf_states.c index 1edfdf8ad4d..832b4f2f83f 100644 --- a/sys/dev/raidframe/rf_states.c +++ b/sys/dev/raidframe/rf_states.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_states.c,v 1.12 2000/01/08 22:57:30 oster Exp $ */ +/* $NetBSD: rf_states.c,v 1.13 2000/01/09 00:00:18 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -176,10 +176,12 @@ rf_ContinueDagAccess(RF_DagList_t * dagList) * free all dags and start over */ desc->status = 1; /* bad status */ { - printf("[%d] DAG failure: %c addr 0x%lx (%ld) nblk 0x%x (%d) buf 0x%lx\n", - desc->tid, desc->type, (long) desc->raidAddress, - (long) desc->raidAddress, (int) desc->numBlocks, - (int) desc->numBlocks, (unsigned long) (desc->bufPtr)); + printf("raid%d: DAG failure: %c addr 0x%lx (%ld) nblk 0x%x (%d) buf 0x%lx\n", + desc->raidPtr->raidid, desc->type, + (long) desc->raidAddress, + (long) desc->raidAddress, (int) desc->numBlocks, + (int) desc->numBlocks, + (unsigned long) (desc->bufPtr)); } } dagList->numDagsDone++; @@ -371,14 +373,16 @@ rf_State_Lock(RF_RaidAccessDesc_t * desc) } } else { if (rf_pssDebug) { - printf("[%d] skipping force/block because already done, psid %ld\n", - desc->tid, (long) asm_p->stripeID); + printf("raid%d: skipping force/block because already done, psid %ld\n", + desc->raidPtr->raidid, + (long) asm_p->stripeID); } } } else { if (rf_pssDebug) { - printf("[%d] skipping force/block because not write or not under recon, psid %ld\n", - desc->tid, (long) asm_p->stripeID); + printf("raid%d: skipping force/block because not write or not under recon, psid %ld\n", + desc->raidPtr->raidid, + (long) asm_p->stripeID); } } } |
