[PATCH 2/8] staging/hv: remove typedef VMSCSI_REQUEST
Bill Pemberton
wfp5p at virginia.edu
Fri Aug 7 19:52:15 UTC 2009
The VMSCSI_REQUEST typedef is removed. The struct it defines is now
named hv_vmscsi_request
Signed-off-by: Bill Pemberton <wfp5p at virginia.edu>
---
drivers/staging/hv/StorVsc.c | 6 +++---
drivers/staging/hv/include/vstorage.h | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c
index 87885ce..3778247 100644
--- a/drivers/staging/hv/StorVsc.c
+++ b/drivers/staging/hv/StorVsc.c
@@ -263,8 +263,8 @@ StorVscInitialize(
DPRINT_ENTER(STORVSC);
- DPRINT_DBG(STORVSC, "sizeof(STORVSC_REQUEST)=%zd sizeof(STORVSC_REQUEST_EXTENSION)=%zd sizeof(struct hv_vstor_packet)=%zd, sizeof(VMSCSI_REQUEST)=%zd",
- sizeof(struct hv_storvsc_request), sizeof(STORVSC_REQUEST_EXTENSION), sizeof(struct hv_vstor_packet), sizeof(VMSCSI_REQUEST));
+ DPRINT_DBG(STORVSC, "sizeof(STORVSC_REQUEST)=%zd sizeof(STORVSC_REQUEST_EXTENSION)=%zd sizeof(struct hv_vstor_packet)=%zd, sizeof(struct hv_vmscsi_request)=%zd",
+ sizeof(struct hv_storvsc_request), sizeof(STORVSC_REQUEST_EXTENSION), sizeof(struct hv_vstor_packet), sizeof(struct hv_vmscsi_request));
/* Make sure we are at least 2 pages since 1 page is used for control */
ASSERT(storDriver->RingBufferSize >= (PAGE_SIZE << 1));
@@ -730,7 +730,7 @@ StorVscOnIORequest(
vstorPacket->Flags |= REQUEST_COMPLETION_FLAG;
- vstorPacket->VmSrb.Length = sizeof(VMSCSI_REQUEST);
+ vstorPacket->VmSrb.Length = sizeof(struct hv_vmscsi_request);
vstorPacket->VmSrb.PortNumber = Request->Host;
vstorPacket->VmSrb.PathId = Request->Bus;
diff --git a/drivers/staging/hv/include/vstorage.h b/drivers/staging/hv/include/vstorage.h
index 99968b8..2ee0418 100644
--- a/drivers/staging/hv/include/vstorage.h
+++ b/drivers/staging/hv/include/vstorage.h
@@ -139,7 +139,7 @@ C_ASSERT(SENSE_BUFFER_SIZE == 0x12);
#define MAX_DATA_BUFFER_LENGTH_WITH_PADDING 0x14
-typedef struct
+struct hv_vmscsi_request
{
unsigned short Length;
unsigned char SrbStatus;
@@ -166,9 +166,9 @@ typedef struct
unsigned char ReservedArray[MAX_DATA_BUFFER_LENGTH_WITH_PADDING];
};
-} VMSCSI_REQUEST, *PVMSCSI_REQUEST;
+};
-C_ASSERT((sizeof(VMSCSI_REQUEST) % 4) == 0);
+C_ASSERT((sizeof(sizeof hv_vmscsi_request) % 4) == 0);
@@ -267,7 +267,7 @@ struct hv_vstor_packet
/* Structure used to forward SCSI commands from the client to the server. */
- VMSCSI_REQUEST VmSrb;
+ struct hv_vmscsi_request VmSrb;
/* Structure used to query channel properties. */
--
1.6.2.5
More information about the devel
mailing list