From: Greg Kroah-Hartman <[email protected]> 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 <[email protected]> Cc: Haiyang Zhang <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/staging/hv/StorVsc.c | 9 +++++---- drivers/staging/hv/storvsc_drv.c | 11 ++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) --- a/drivers/staging/hv/StorVsc.c +++ b/drivers/staging/hv/StorVsc.c @@ -21,12 +21,13 @@ * */ +#define KERNEL_2_6_27 -#include "logging.h" +#include "include/logging.h" -#include "StorVscApi.h" -#include "VmbusPacketFormat.h" -#include "vstorage.h" +#include "include/StorVscApi.h" +#include "include/VmbusPacketFormat.h" +#include "include/vstorage.h" // --- 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 * #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 sc // 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); _______________________________________________ Virtualization mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/virtualization
