xnu-792.24.17.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 07966f77d766d903ad9a758201a43c075e4db809..9a0c0605408911d19d8620051ec8c33f3420adb5 100644 (file)
--- a/bsd/kern/bsd_stubs.c
+++ b/bsd/kern/bsd_stubs.c
@@ -28,27 +28,33 @@
 #include <vm/vm_map.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
+#include <sys/proc_internal.h>
 #include <sys/buf.h>   /* for SET */
 #include <sys/user.h>
 
 /* Just to satisfy pstat command */
 int     dmmin, dmmax, dmtext;
 
+vm_offset_t
 kmem_mb_alloc(vm_map_t  mbmap, int size) 
 {
         vm_offset_t addr;
        if (kernel_memory_allocate(mbmap, &addr, size,
                0,
                KMA_NOPAGEWAIT|KMA_KOBJECT) == KERN_SUCCESS)
-                                return((void *)addr);
+                       return(addr);
        else
                return(0);
                
 }
 
-pcb_synch() {}
-unix_master() {}
-unix_release() {}
+/*
+ * XXX this function only exists to be exported and do nothing.
+ */
+void
+pcb_synch(void)
+{
+}
 
 struct proc *
 current_proc(void)
@@ -56,10 +62,10 @@ current_proc(void)
        /* Never returns a NULL */
        struct uthread * ut;
        struct proc *p; 
-       thread_act_t thr_act = current_act();
+       thread_t thr_act = current_thread();
 
        ut = (struct uthread *)get_bsdthread_info(thr_act); 
-       if (ut &&  (ut->uu_flag & P_VFORK) && ut->uu_proc) {
+       if (ut &&  (ut->uu_flag & UT_VFORK) && ut->uu_proc) {
                p = ut->uu_proc;
                if ((p->p_flag & P_INVFORK) == 0) 
                        panic("returning child proc not under vfork");
@@ -100,6 +106,9 @@ bdevsw_isfree(int index)
                            sizeof(struct bdevsw)) == 0)
                    break;
            }
+       } else {
+               /* NB: Not used below unless index is in range */
+               devsw = &bdevsw[index];
        }
 
        if ((index < 0) || (index >= nblkdev) ||
@@ -122,8 +131,9 @@ bdevsw_add(int index, struct bdevsw * bsw)
        struct bdevsw *devsw;
 
        if (index == -1) {
-           devsw = bdevsw;
-           for(index=0; index < nblkdev; index++, devsw++) {
+           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)
@@ -238,7 +248,28 @@ cdevsw_remove(int index, struct cdevsw * csw)
        return(index);
 }
 
-int
+static int
+cdev_set_bdev(int cdev, int bdev)
+{
+       extern int chrtoblk_add(int cdev, int bdev);
+
+       return (chrtoblk_set(cdev, bdev));
+}
+
+int  
+cdevsw_add_with_bdev(int index, struct cdevsw * csw, int bdev)
+{
+       index = cdevsw_add(index, csw);
+       if (index < 0) {
+               return (index);
+       }
+       if (cdev_set_bdev(index, bdev) < 0) {
+               cdevsw_remove(index, csw);
+               return (-1);
+       }
+       return (index);
+}
+
 issingleuser(void)
 {
        char namep[16];