[src/trunk]: src/sys/dev/raidframe - bail if we can't allocate memory for rai...

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

details:   https://anonhg.NetBSD.org/src/rev/1412a775a9c5
branches:  trunk
changeset: 480174:1412a775a9c5
user:      oster <oster%NetBSD.org@localhost>
date:      Thu Jan 06 02:06:41 2000 +0000

description:
- bail if we can't allocate memory for raid_softc's.  Set 'numraid' as
appropriate for that condition.
- nuke some debugging stuff that we hope we'll never need again
- minor cleanups

diffstat:

 sys/dev/raidframe/rf_netbsdkintf.c |  39 +++++++------------------------------
 1 files changed, 8 insertions(+), 31 deletions(-)

diffs (142 lines):

diff -r cb688bda164a -r 1412a775a9c5 sys/dev/raidframe/rf_netbsdkintf.c
--- a/sys/dev/raidframe/rf_netbsdkintf.c        Thu Jan 06 01:43:30 2000 +0000
+++ b/sys/dev/raidframe/rf_netbsdkintf.c        Thu Jan 06 02:06:41 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_netbsdkintf.c,v 1.38 2000/01/05 04:15:30 oster Exp $        */
+/*     $NetBSD: rf_netbsdkintf.c,v 1.39 2000/01/06 02:06:41 oster Exp $        */
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -187,15 +187,6 @@
                   void (*cbFunc) (struct buf *), void *cbArg, 
                   int logBytesPerSector, struct proc * b_proc);
 
-#define Dprintf0(s)       if (rf_queueDebug) \
-     rf_debug_printf(s,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-#define Dprintf1(s,a)     if (rf_queueDebug) \
-     rf_debug_printf(s,a,NULL,NULL,NULL,NULL,NULL,NULL,NULL)
-#define Dprintf2(s,a,b)   if (rf_queueDebug) \
-     rf_debug_printf(s,a,b,NULL,NULL,NULL,NULL,NULL,NULL)
-#define Dprintf3(s,a,b,c) if (rf_queueDebug) \
-     rf_debug_printf(s,a,b,c,NULL,NULL,NULL,NULL,NULL)
-
 int raidmarkclean(dev_t dev, struct vnode *b_vp, int);
 int raidmarkdirty(dev_t dev, struct vnode *b_vp, int);
 
@@ -361,7 +352,9 @@
                RF_Calloc(raidPtrs[raidID], 1, sizeof(RF_Raid_t),
                          (RF_Raid_t *));
                if (raidPtrs[raidID] == NULL) {
-                       printf("raidPtrs[%d] is NULL\n", raidID);
+                       printf("WARNING: raidPtrs[%d] is NULL\n", raidID);
+                       numraid = raidID;
+                       return;
                }
        }
 }
@@ -834,16 +827,9 @@
                        return (EBUSY);
                }
 
-               if (rf_debugKernelAccess) {
-                       printf("call shutdown\n");
-               }
-
                retcode = rf_Shutdown(raidPtrs[unit]);
 
-               db1_printf(("Done main shutdown\n"));
-
                pool_destroy(&rs->sc_cbufpool);
-               db1_printf(("Done freeing component buffer freelist\n"));
 
                /* It's no longer initialized... */
                rs->sc_flags &= ~RAIDF_INITED;
@@ -1270,21 +1256,17 @@
 
        switch (cmd) {
        case DIOCGDINFO:
-               db1_printf(("DIOCGDINFO %d %d\n", (int) dev, (int) DISKPART(dev)));
                *(struct disklabel *) data = *(rs->sc_dkdev.dk_label);
                break;
 
        case DIOCGPART:
-               db1_printf(("DIOCGPART: %d %d\n", (int) dev, (int) DISKPART(dev)));
                ((struct partinfo *) data)->disklab = rs->sc_dkdev.dk_label;
                ((struct partinfo *) data)->part =
                    &rs->sc_dkdev.dk_label->d_partitions[DISKPART(dev)];
                break;
 
        case DIOCWDINFO:
-               db1_printf(("DIOCWDINFO\n"));
        case DIOCSDINFO:
-               db1_printf(("DIOCSDINFO\n"));
                if ((error = raidlock(rs)) != 0)
                        return (error);
 
@@ -1307,7 +1289,6 @@
                break;
 
        case DIOCWLABEL:
-               db1_printf(("DIOCWLABEL\n"));
                if (*(int *) data != 0)
                        rs->sc_flags |= RAIDF_WLABEL;
                else
@@ -1315,13 +1296,12 @@
                break;
 
        case DIOCGDEFLABEL:
-               db1_printf(("DIOCGDEFLABEL\n"));
                raidgetdefaultlabel(raidPtrs[unit], rs,
                    (struct disklabel *) data);
                break;
 
        default:
-               retcode = ENOTTY;       /* XXXX ?? OR EINVAL ? */
+               retcode = ENOTTY;
        }
        return (retcode);
 
@@ -1339,8 +1319,6 @@
        int     unit;
 {
        int     retcode;
-       /* int ix; */
-       /* struct raidbuf *raidbp; */
        struct raid_softc *rs;
 
        retcode = 0;
@@ -1378,6 +1356,8 @@
  * so that in the extremely rare case that two recons happen at once, 
  * we know for which device were requesting a spare table
  * XXX
+ * 
+ * XXX This code is not currently used. GO
  */
 int 
 rf_GetSpareTableFromDaemon(req)
@@ -1404,6 +1384,7 @@
                                         * alloc'd */
        return (retcode);
 }
+
 /* a wrapper around rf_DoAccess that extracts appropriate info from the 
  * bp & passes it down.
  * any calls originating in the kernel must use non-blocking I/O
@@ -1598,8 +1579,6 @@
 
        switch (req->type) {
        case RF_IO_TYPE_NOP:    /* used primarily to unlock a locked queue */
-               /* Dprintf2("rf_DispatchKernelIO: NOP to r %d c %d\n",
-                * queue->row, queue->col); */
                /* XXX need to do something extra here.. */
                /* I'm leaving this in, as I've never actually seen it used,
                 * and I'd like folks to report it... GO */
@@ -1632,8 +1611,6 @@
                /* acc wouldn't have been let in if there were any pending
                 * reqs at any other priority */
                queue->curPriority = req->priority;
-               /* Dprintf3("rf_DispatchKernelIO: %c to row %d col %d\n",
-                * req->type, queue->row, queue->col); */
 
                db1_printf(("Going for %c to unit %d row %d col %d\n",
                        req->type, unit, queue->row, queue->col));