[aoe] Rename aoe__mount_disk to AOE_S_MOUNT_DISK
authorShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Sun, 2 Jan 2011 05:07:00 +0000 (00:07 -0500)
committerShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Sun, 2 Jan 2011 05:07:00 +0000 (00:07 -0500)
src/aoe/driver.c
src/include/aoe.h
src/util/winvblk.c

index 9320f64..8dec8f1 100644 (file)
@@ -1760,9 +1760,9 @@ NTSTATUS STDCALL AoeBusDevCtlShow(IN PIRP irp) {
         irp->AssociatedIrp.SystemBuffer,
         disks,
         (io_stack_loc->Parameters.DeviceIoControl.OutputBufferLength <
-          (sizeof (AOE_S_MOUNT_DISKS) + (count * sizeof (aoe__mount_disk))) ?
+          (sizeof (AOE_S_MOUNT_DISKS) + (count * sizeof (AOE_S_MOUNT_DISK))) ?
           io_stack_loc->Parameters.DeviceIoControl.OutputBufferLength :
-          (sizeof (AOE_S_MOUNT_DISKS) + (count * sizeof (aoe__mount_disk)))
+          (sizeof (AOE_S_MOUNT_DISKS) + (count * sizeof (AOE_S_MOUNT_DISK)))
         )
       );
     wv_free(disks);
index d04992c..9401cf1 100644 (file)
@@ -75,19 +75,18 @@ typedef struct AOE_MOUNT_TARGETS {
     AOE_S_MOUNT_TARGET Target[];
   } AOE_S_MOUNT_TARGETS, * AOE_SP_MOUNT_TARGETS;
 
-winvblock__def_struct(aoe__mount_disk)
-  {
+typedef struct AOE_MOUNT_DISK {
     winvblock__uint32 Disk;
     winvblock__uint8 ClientMac[6];
     winvblock__uint8 ServerMac[6];
     winvblock__uint32 Major;
     winvblock__uint32 Minor;
     LONGLONG LBASize;
-  };
+  } AOE_S_MOUNT_DISK, * AOE_SP_MOUNT_DISK;
 
 typedef struct AOE_MOUNT_DISKS {
     winvblock__uint32 Count;
-    aoe__mount_disk Disk[];
+    AOE_S_MOUNT_DISK Disk[];
   } AOE_S_MOUNT_DISKS, * AOE_S_MOUNT_DISKS;
 
 extern void aoe__reset_probe(void);
index e75542f..8b21a37 100644 (file)
@@ -306,7 +306,7 @@ static int STDCALL cmd_show(void) {
 
     mounted_disks = malloc(
         sizeof (AOE_S_MOUNT_DISKS) +
-        (32 * sizeof (aoe__mount_disk)) 
+        (32 * sizeof (AOE_S_MOUNT_DISK)) 
       );
     if (mounted_disks == NULL) {
         printf("Out of memory\n");
@@ -318,7 +318,7 @@ static int STDCALL cmd_show(void) {
       NULL,
       0,
       mounted_disks,
-      sizeof (AOE_S_MOUNT_DISKS) + (32 * sizeof (aoe__mount_disk)),
+      sizeof (AOE_S_MOUNT_DISKS) + (32 * sizeof (AOE_S_MOUNT_DISK)),
       &bytes_returned,
       (LPOVERLAPPED) NULL
     )) {