diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-14 17:18:50 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 19:01:44 (GMT) |
| commit | 97f4ee3d93602882eb22a3f5e6bf4eb51b7414ce (patch) | |
| tree | 3736a6d30461ac288962e967f630711507bae17d /drivers/staging/hv/storvsc_drv.c | |
| parent | c4ca0e9e6de92f46271599db90f4ab006c133441 (diff) | |
| download | linux-fsl-qoriq-97f4ee3d93602882eb22a3f5e6bf4eb51b7414ce.tar.xz | |
Staging: hv: make the Hyper-V virtual storage driver build
The #define KERNEL_2_6_27 needs to be set, and I adjusted the include
directories a bit to get things to build properly.
I also fixed up the direct access of bus_id, as that field is now gone.
Some minor scsi api changes were needed as well.
The hv_storvsc code should now build properly, with no errors.
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/storvsc_drv.c')
| -rw-r--r-- | drivers/staging/hv/storvsc_drv.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index d5a337b..0a1c144 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -21,6 +21,7 @@ * */ +#define KERNEL_2_6_27 #include <linux/init.h> #include <linux/module.h> @@ -40,10 +41,10 @@ #include <scsi/scsi_dbg.h> #endif -#include "logging.h" -#include "vmbus.h" +#include "include/logging.h" +#include "include/vmbus.h" -#include "StorVscApi.h" +#include "include/StorVscApi.h" // // #defines @@ -296,7 +297,7 @@ static int storvsc_probe(struct device *device) #if defined(KERNEL_2_6_27) host_device_ctx->request_pool = kmem_cache_create - (device_ctx->device.bus_id, + (dev_name(&device_ctx->device), sizeof(struct storvsc_cmd_request) + storvsc_drv_obj->RequestExtSize, 0, SLAB_HWCACHE_ALIGN, NULL); @@ -1250,7 +1251,7 @@ static int storvsc_report_luns(struct scsi_device *sdev, unsigned int luns[], un // cmd length *(unsigned int*)&cmd[6] = cpu_to_be32(report_len); - result = scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, (unsigned char*)report_luns, report_len, &sshdr, 30*HZ, 3); + result = scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, (unsigned char*)report_luns, report_len, &sshdr, 30*HZ, 3, NULL); if (result != 0) { kfree(report_luns); |