lkml.org 
[lkml]   [2011]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/16] Staging: hv: Move the definition of struct storvsc_request_extension
    Date
    In preparation for getting rid of the inclusion of storvsc.c from
    blkvsc.c, move the definition of struct storvsc_request_extension
    from storvsc.c to storvsc_api.h.

    Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
    Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
    Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
    ---
    drivers/staging/hv/blkvsc.c | 1 +
    drivers/staging/hv/storvsc.c | 13 -------------
    drivers/staging/hv/storvsc_api.h | 12 ++++++++++++
    3 files changed, 13 insertions(+), 13 deletions(-)

    diff --git a/drivers/staging/hv/blkvsc.c b/drivers/staging/hv/blkvsc.c
    index 7c8729b..88d6e3c 100644
    --- a/drivers/staging/hv/blkvsc.c
    +++ b/drivers/staging/hv/blkvsc.c
    @@ -24,6 +24,7 @@
    #include <linux/mm.h>
    #include "hv_api.h"
    #include "storvsc.c"
    +#include "storvsc_api.h"

    static const char *g_blk_driver_name = "blkvsc";

    diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
    index e2ad729..56f3cc9 100644
    --- a/drivers/staging/hv/storvsc.c
    +++ b/drivers/staging/hv/storvsc.c
    @@ -33,19 +33,6 @@
    #include "channel.h"


    -struct storvsc_request_extension {
    - /* LIST_ENTRY ListEntry; */
    -
    - struct hv_storvsc_request *request;
    - struct hv_device *device;
    -
    - /* Synchronize the request/response if needed */
    - int wait_condition;
    - wait_queue_head_t wait_event;
    -
    - struct vstor_packet vstor_packet;
    -};
    -
    /* A storvsc device is a device object that contains a vmbus channel */
    struct storvsc_device {
    struct hv_device *device;
    diff --git a/drivers/staging/hv/storvsc_api.h b/drivers/staging/hv/storvsc_api.h
    index fbf5755..629144c 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 "vstorage.h"
    #include "vmbus_api.h"

    /* Defines */
    @@ -102,6 +103,17 @@ struct storvsc_device_info {
    unsigned char target_id;
    };

    +struct storvsc_request_extension {
    + struct hv_storvsc_request *request;
    + struct hv_device *device;
    +
    + /* Synchronize the request/response if needed */
    + int wait_condition;
    + wait_queue_head_t wait_event;
    +
    + struct vstor_packet vstor_packet;
    +};
    +
    /* Interface */
    int stor_vsc_initialize(struct hv_driver *driver);
    int stor_vsc_on_host_reset(struct hv_device *device);
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-03-23 18:43    [W:0.028 / U:62.272 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site