[src/trunk]: src/sys/dev/raidframe Nuke desc->tid.

[oster <oster%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d575553a9c21
branches:  trunk
changeset: 480292:d575553a9c21
user:      oster <oster%NetBSD.org@localhost>
date:      Sun Jan 09 00:00:18 2000 +0000

description:
Nuke desc->tid.

diffstat:

 sys/dev/raidframe/rf_desc.h   |   4 +---
 sys/dev/raidframe/rf_driver.c |   3 +--
 sys/dev/raidframe/rf_states.c |  22 +++++++++++++---------
 3 files changed, 15 insertions(+), 14 deletions(-)

diffs (82 lines):

diff -r b06be19b7a18 -r d575553a9c21 sys/dev/raidframe/rf_desc.h
--- a/sys/dev/raidframe/rf_desc.h       Sat Jan 08 23:54:26 2000 +0000
+++ b/sys/dev/raidframe/rf_desc.h       Sun Jan 09 00:00:18 2000 +0000
@@ -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 @@
        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 -r b06be19b7a18 -r d575553a9c21 sys/dev/raidframe/rf_driver.c
--- a/sys/dev/raidframe/rf_driver.c     Sat Jan 08 23:54:26 2000 +0000
+++ b/sys/dev/raidframe/rf_driver.c     Sun Jan 09 00:00:18 2000 +0000
@@ -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 @@
        desc->numPending = 0;
        desc->cleanupList = NULL;
        rf_MakeAllocList(desc->cleanupList);
-       desc->tid = 0; /* XXX Make this go away */
        return (desc);
 }
 
diff -r b06be19b7a18 -r d575553a9c21 sys/dev/raidframe/rf_states.c
--- a/sys/dev/raidframe/rf_states.c     Sat Jan 08 23:54:26 2000 +0000
+++ b/sys/dev/raidframe/rf_states.c     Sun Jan 09 00:00:18 2000 +0000
@@ -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 @@
                 * 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 @@
                                        }
                                } 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);
                                }
                        }
                }