From ced01b0df71fb184744c473b934f9ea70454b750 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Mon, 28 Mar 2011 09:33:29 -0700 Subject: [PATCH] Staging: hv: Add a function to map a hv_driver pointer to storvsc driver Get rid of the need for struct hv_device to be the first element of struct host_device_context. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/blkvsc_drv.c | 2 +- drivers/staging/hv/storvsc_api.h | 8 ++++++-- drivers/staging/hv/storvsc_drv.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 02472c69090f..5a9d20c8a37d 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -154,7 +154,7 @@ static int blk_vsc_initialize(struct hv_driver *driver) struct storvsc_driver_object *stor_driver; int ret = 0; - stor_driver = (struct storvsc_driver_object *)driver; + stor_driver = hvdr_to_stordr(driver); /* Make sure we are at least 2 pages since 1 page is used for control */ /* ASSERT(stor_driver->RingBufferSize >= (PAGE_SIZE << 1)); */ diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h index eeaeaefb8652..5c80cdb5dc1a 100644 --- a/drivers/staging/hv/storvsc_api.h +++ b/drivers/staging/hv/storvsc_api.h @@ -25,6 +25,7 @@ #ifndef _STORVSC_API_H_ #define _STORVSC_API_H_ +#include #include "vstorage.h" #include "vmbus_api.h" @@ -90,8 +91,6 @@ struct hv_storvsc_request { /* Represents the block vsc driver */ struct storvsc_driver_object { - /* Must be the first field */ - /* Which is a bug FIXME! */ struct hv_driver base; /* Set by caller (in bytes) */ @@ -159,6 +158,11 @@ static inline void put_stor_device(struct hv_device *device) atomic_dec(&stor_device->ref_count); } +static inline struct storvsc_driver_object *hvdr_to_stordr(struct hv_driver *d) +{ + return container_of(d, struct storvsc_driver_object, base); +} + /* Interface */ int stor_vsc_on_device_add(struct hv_device *device, diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 1d13f1baf800..268c60707ebe 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -79,7 +79,7 @@ static int stor_vsc_initialize(struct hv_driver *driver) { struct storvsc_driver_object *stor_driver; - stor_driver = (struct storvsc_driver_object *)driver; + stor_driver = hvdr_to_stordr(driver); DPRINT_DBG(STORVSC, "sizeof(STORVSC_REQUEST)=%zd " "sizeof(struct storvsc_request_extension)=%zd " -- 2.34.1