[bus] Rename bus__type::first_child_ptr to first_child

diff --git a/src/aoe/driver.c b/src/aoe/driver.c
index fe1c166..886b3e5 100644 (file)
--- a/src/aoe/driver.c
+++ b/src/aoe/driver.c
@@ -2188,7 +2188,7 @@ static NTSTATUS STDCALL show(
     DBG("Got IOCTL_AOE_SHOW...\n");
 
     bus = bus__get(dev);
-    dev_walker = bus->first_child_ptr;
+    dev_walker = bus->first_child;
     count = 0;
     while (dev_walker != NULL) {
         count++;
@@ -2206,7 +2206,7 @@ static NTSTATUS STDCALL show(
     disks->Count = count;
 
     count = 0;
-    dev_walker = bus->first_child_ptr;
+    dev_walker = bus->first_child;
     while (dev_walker != NULL) {
         disk__type_ptr disk = disk__get_ptr(dev_walker);
         struct aoe__disk_type_ * aoe_disk = aoe__get_(dev_walker);

diff --git a/src/include/bus.h b/src/include/bus.h
index b274f72..f5f42c1 100644 (file)
--- a/src/include/bus.h
+++ b/src/include/bus.h
@@ -32,7 +32,7 @@ struct bus__type {
     PDEVICE_OBJECT LowerDeviceObject;
     PDEVICE_OBJECT PhysicalDeviceObject;
     winvblock__uint32 Children;
-    struct device__type * first_child_ptr;
+    struct device__type * first_child;
     KSPIN_LOCK SpinLock;
     LIST_ENTRY tracking;
     winvblock__any_ptr ext;

diff --git a/src/winvblock/bus/bus.c b/src/winvblock/bus/bus.c
index f1b15d0..7ed1d6e 100644 (file)
--- a/src/winvblock/bus/bus.c
+++ b/src/winvblock/bus/bus.c
@@ -79,10 +79,10 @@ winvblock__lib_func winvblock__bool STDCALL bus__add_child(
     dev_ptr->ops.init(dev_ptr);
     dev_obj_ptr->Flags &= ~DO_DEVICE_INITIALIZING;
     /* Add the new device's extension to the bus' list of children. */
-    if (bus_ptr->first_child_ptr == NULL) {
-        bus_ptr->first_child_ptr = dev_ptr;
+    if (bus_ptr->first_child == NULL) {
+        bus_ptr->first_child = dev_ptr;
       } else {
-        walker = bus_ptr->first_child_ptr;
+        walker = bus_ptr->first_child;
         while (walker->next_sibling_ptr != NULL)
           walker = walker->next_sibling_ptr;
         walker->next_sibling_ptr = dev_ptr;

diff --git a/src/winvblock/bus/dev_ctl.c b/src/winvblock/bus/dev_ctl.c
index 7180d24..912699f 100644 (file)
--- a/src/winvblock/bus/dev_ctl.c
+++ b/src/winvblock/bus/dev_ctl.c
@@ -54,7 +54,7 @@ static NTSTATUS STDCALL disk_detach(
 
   DBG ( "Request to detach disk: %d\n", *( winvblock__uint32_ptr ) buffer );
   bus_ptr = bus__get(dev_ptr);
-  dev_walker = bus_ptr->first_child_ptr;
+  dev_walker = bus_ptr->first_child;
   if ( dev_walker != NULL )
     disk_walker = disk__get_ptr ( dev_walker );
   prev_disk_walker = disk_walker;
@@ -76,15 +76,12 @@ static NTSTATUS STDCALL disk_detach(
          return STATUS_INVALID_DEVICE_REQUEST;
        }
       DBG ( "Deleting disk %d\n", disk_walker->DiskNumber );
-      if ( disk_walker == disk__get_ptr ( bus_ptr->first_child_ptr ) )
-       {
-         bus_ptr->first_child_ptr = dev_walker->next_sibling_ptr;
-       }
-      else
-       {
-         prev_disk_walker->device->next_sibling_ptr =
-           dev_walker->next_sibling_ptr;
-       }
+      if (disk_walker == disk__get_ptr(bus_ptr->first_child))
+         bus_ptr->first_child = dev_walker->next_sibling_ptr;
+      else {
+          prev_disk_walker->device->next_sibling_ptr =
+            dev_walker->next_sibling_ptr;
+       }
       disk_walker->Unmount = TRUE;
       dev_walker->next_sibling_ptr = NULL;
       if ( bus_ptr->PhysicalDeviceObject != NULL )

diff --git a/src/winvblock/bus/pnp.c b/src/winvblock/bus/pnp.c
index 741f619..d9e50fa 100644 (file)
--- a/src/winvblock/bus/pnp.c
+++ b/src/winvblock/bus/pnp.c
@@ -109,7 +109,7 @@ NTSTATUS STDCALL bus_pnp__remove_dev(
   IoSkipCurrentIrpStackLocation ( Irp );
   bus_ptr = bus__get(dev_ptr);
   status = IoCallDriver ( bus_ptr->LowerDeviceObject, Irp );
-  walker = bus_ptr->first_child_ptr;
+  walker = bus_ptr->first_child;
   while ( walker != NULL )
     {
       next = walker->next_sibling_ptr;
@@ -119,7 +119,7 @@ NTSTATUS STDCALL bus_pnp__remove_dev(
       walker = next;
     }
   bus_ptr->Children = 0;
-  bus_ptr->first_child_ptr = NULL;
+  bus_ptr->first_child = NULL;
   lower = bus_ptr->LowerDeviceObject;
   if (lower)
     IoDetachDevice(lower);
@@ -159,7 +159,7 @@ NTSTATUS STDCALL bus_pnp__query_dev_relations(
     }
   probe__disks (  );
   count = 0;
-  walker = bus_ptr->first_child_ptr;
+  walker = bus_ptr->first_child;
   while ( walker != NULL )
     {
       count++;
@@ -183,7 +183,7 @@ NTSTATUS STDCALL bus_pnp__query_dev_relations(
   dev_relations->Count = count;
 
   count = 0;
-  walker = bus_ptr->first_child_ptr;
+  walker = bus_ptr->first_child;
   while ( walker != NULL )
     {
       ObReferenceObject ( walker->Self );