1 From foo@baz Tue Jul 14 10:24:38 PDT 2009
2 Date: Tue, 14 Jul 2009 10:24:38 -0700
3 From: Greg Kroah-Hartman <gregkh@suse.de>
4 Subject: Staging: hv: make the Hyper-V virtual block driver build
6 From: Greg Kroah-Hartman <gregkh@suse.de>
8 The #define KERNEL_2_6_27 needs to be set, and I adjusted the include
9 directories a bit to get things to build properly.
11 I also fixed up the direct access of bus_id, as that field is now gone.
12 Lots of block api changes were needed, and I don't think I got it
13 all correct. It would be great of someone who knows the block api better
16 The hv_blkvsc code should now build, with no errors.
18 Cc: Hank Janssen <hjanssen@microsoft.com>
19 Cc: Haiyang Zhang <haiyangz@microsoft.com>
20 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
24 drivers/staging/hv/BlkVsc.c | 2 +-
25 drivers/staging/hv/blkvsc_drv.c | 9 +++++----
26 2 files changed, 6 insertions(+), 5 deletions(-)
28 --- a/drivers/staging/hv/BlkVsc.c
29 +++ b/drivers/staging/hv/BlkVsc.c
34 -#include "../storvsc/StorVsc.c"
37 static const char* gBlkDriverName="blkvsc";
39 --- a/drivers/staging/hv/blkvsc_drv.c
40 +++ b/drivers/staging/hv/blkvsc_drv.c
45 +#define KERNEL_2_6_27
47 #include <linux/init.h>
48 #include <linux/module.h>
50 #include <scsi/scsi_eh.h>
51 #include <scsi/scsi_dbg.h>
55 +#include "include/logging.h"
56 +#include "include/vmbus.h"
58 -#include "StorVscApi.h"
59 +#include "include/StorVscApi.h"
63 @@ -313,7 +314,7 @@ static int blkvsc_probe(struct device *d
64 ASSERT(sizeof(struct blkvsc_request_group) <= sizeof(struct blkvsc_request));
67 - blkdev->request_pool = kmem_cache_create(device_ctx->device.bus_id,
68 + blkdev->request_pool = kmem_cache_create(dev_name(&device_ctx->device),
69 sizeof(struct blkvsc_request) + storvsc_drv_obj->RequestExtSize, 0,
70 SLAB_HWCACHE_ALIGN, NULL);