xnu-2782.40.9.tar.gz

[apple/xnu.git] / bsd / kern / bsd_stubs.c

diff --git a/bsd/kern/bsd_stubs.c b/bsd/kern/bsd_stubs.c
index 19da61270873a5667b80af9c15d485aea2fff598..648d6e30568d5c7d25ae437e4a79c81adfcb19df 100644 (file)
--- a/bsd/kern/bsd_stubs.c
+++ b/bsd/kern/bsd_stubs.c
@@ -49,7 +49,6 @@ extern vm_offset_t kmem_mb_alloc(vm_map_t, int, int);
 
 /* XXX most of these just exist to export; there's no good header for them*/
 void   pcb_synch(void);
-void   tbeproc(void *);
 
 TAILQ_HEAD(,devsw_lock) devsw_locks;
 lck_mtx_t devsw_lock_list_mtx;
@@ -120,24 +119,29 @@ struct cdevsw nocdev = NO_CDEVICE;
  *       else see whether the index is free
  *     return the major number that is free else -1
  *
+ *     if index is negative, we start
+ *     looking for a free slot at the absolute value of index,
+ *     instead of starting at 0
  */
 int
 bdevsw_isfree(int index)
 {
        struct bdevsw *devsw;
-       if (index == -1) {
-           devsw = bdevsw;
-           for(index=0; index < nblkdev; index++, devsw++) {
-               if(memcmp((char *)devsw, 
-                           (char *)&nobdev, 
-                           sizeof(struct bdevsw)) == 0)
-                   break;
+
+       if (index < 0) {
+           if (index == -1)
+               index = 1;      /* start at 1 to avoid collision with volfs (Radar 2842228) */
+           else
+               index = -index; /* start at least this far up in the table */
+           devsw = &bdevsw[index];
+           for(; index < nblkdev; index++, devsw++) {
+               if(memcmp((char *)devsw, 
+                           (char *)&nobdev, 
+                           sizeof(struct bdevsw)) == 0)
+                   break;
            }
-       } else {
-               /* NB: Not used below unless index is in range */
-               devsw = &bdevsw[index];
        }
-
+       devsw = &bdevsw[index];
        if ((index < 0) || (index >= nblkdev) ||
            (memcmp((char *)devsw, 
                          (char *)&nobdev, 
@@ -151,33 +155,22 @@ bdevsw_isfree(int index)
  *     if index is -1, find a free slot to add
  *       else see whether the slot is free
  *     return the major number that is used else -1
+ *
+ *     if index is negative, we start
+ *     looking for a free slot at the absolute value of index,
+ *     instead of starting at 0
  */
 int
 bdevsw_add(int index, struct bdevsw * bsw) 
 {
-       struct bdevsw *devsw;
-
-       if (index == -1) {
-           devsw = &bdevsw[1];         /* Start at slot 1 - this is a hack to fix the index=1 hack */
-           /* yes, start at 1 to avoid collision with volfs (Radar 2842228) */
-           for(index=1; index < nblkdev; index++, devsw++) {
-               if(memcmp((char *)devsw, 
-                           (char *)&nobdev, 
-                           sizeof(struct bdevsw)) == 0)
-                   break;
-           }
-       }
-       devsw = &bdevsw[index];
-       if ((index < 0) || (index >= nblkdev) ||
-           (memcmp((char *)devsw, 
-                         (char *)&nobdev, 
-                         sizeof(struct bdevsw)) != 0)) {
+       index = bdevsw_isfree(index);
+       if (index < 0) {
                return(-1);
        }
        bdevsw[index] = *bsw;
        return(index);
 }
-/* 
+/*
  *     if the slot has the same bsw, then remove
  *     else -1
  */
@@ -201,19 +194,27 @@ bdevsw_remove(int index, struct bdevsw * bsw)
  *     if index is -1, return a free slot if avaliable
  *       else see whether the index is free
  *     return the major number that is free else -1
+ *
+ *     if index is negative, we start
+ *     looking for a free slot at the absolute value of index,
+ *     instead of starting at 0
  */
 int
 cdevsw_isfree(int index)
 {
        struct cdevsw *devsw;
 
-       if (index == -1) {
-           devsw = cdevsw;
-           for(index=0; index < nchrdev; index++, devsw++) {
-               if(memcmp((char *)devsw, 
-                           (char *)&nocdev, 
-                           sizeof(struct cdevsw)) == 0)
-                   break;
+       if (index < 0) {
+           if (index == -1)
+               index = 0;
+           else
+               index = -index; /* start at least this far up in the table */
+           devsw = &cdevsw[index];
+           for(; index < nchrdev; index++, devsw++) {
+               if(memcmp((char *)devsw, 
+                           (char *)&nocdev, 
+                           sizeof(struct cdevsw)) == 0)
+                   break;
            }
        }
        devsw = &cdevsw[index];
@@ -231,45 +232,27 @@ cdevsw_isfree(int index)
  *       else see whether the slot is free
  *     return the major number that is used else -1
  *
+ *     if index is negative, we start
+ *     looking for a free slot at the absolute value of index,
+ *     instead of starting at 0
+ *
  * NOTE:       In practice, -1 is unusable, since there are kernel internal
  *             devices that call this function with absolute index values,
  *             which will stomp on free-slot based assignments that happen
- *             before them.  Therefore, if index is negative, we start
- *             looking for a free slot at the absolute value of index,
- *             instead of starting at 0 (lets out slot 1, but that's one
- *             of the problem slots down low - the vndevice).  -12 is
- *             currently a safe starting point.
+ *             before them.  -24 is currently a safe starting point.
  */
 int
 cdevsw_add(int index, struct cdevsw * csw) 
 {
-       struct cdevsw *devsw;
-
+       index = cdevsw_isfree(index);
        if (index < 0) {
-           if (index == -1)
-               index = 0;      /* historical behaviour; XXX broken */
-           else
-               index = -index; /* start at least this far up in the table */
-           devsw = &cdevsw[index];
-           for(; index < nchrdev; index++, devsw++) {
-               if(memcmp((char *)devsw, 
-                           (char *)&nocdev, 
-                           sizeof(struct cdevsw)) == 0)
-                   break;
-           }
-       }
-       devsw = &cdevsw[index];
-       if ((index < 0) || (index >= nchrdev) ||
-           (memcmp((char *)devsw, 
-                         (char *)&nocdev, 
-                         sizeof(struct cdevsw)) != 0)) {
                return(-1);
        }
        cdevsw[index] = *csw;
        return(index);
 }
 /*
- *     if the index has the same bsw, then remove
+ *     if the slot has the same csw, then remove
  *     else -1
  */
 int
@@ -333,16 +316,6 @@ cdevsw_setkqueueok(int index, struct cdevsw *csw, int use_offset)
 
 #include <pexpert/pexpert.h>   /* for PE_parse_boot_arg */
 
-void
-tbeproc(void *procp)
-{
-       struct proc *p = procp;
-
-       if (p)
-               OSBitOrAtomic(P_TBE, &p->p_flag);
-       return;
-}
-
 /*
  * Copy the "hostname" variable into a caller-provided buffer
  * Returns: 0 for success, ENAMETOOLONG for insufficient buffer space.