From d4becd05cc3d9637264489c7d6d6f8d903cd82a1 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 10 May 2011 07:53:51 -0700 Subject: [PATCH] --- yaml --- r: 249447 b: refs/heads/master c: 1f9c54e40f8a70d2505fff08e6c0d1d7dc9761f6 h: refs/heads/master i: 249445: b51507ddd82d145e8d8f1d18f509c3cdb2e26ada 249443: 297ffa601bd8725b17d8978fcba40c493da6ce91 249439: 0c4b065a51d16774cd3de7eae58e2069ed772632 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/blkvsc_drv.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8290532a1f94..d7005a53c6e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e9fed195bac5eb89e2ee3c9ce89379b8a55be4f +refs/heads/master: 1f9c54e40f8a70d2505fff08e6c0d1d7dc9761f6 diff --git a/trunk/drivers/staging/hv/blkvsc_drv.c b/trunk/drivers/staging/hv/blkvsc_drv.c index b54130be3ee1..51d1265b793f 100644 --- a/trunk/drivers/staging/hv/blkvsc_drv.c +++ b/trunk/drivers/staging/hv/blkvsc_drv.c @@ -115,7 +115,7 @@ struct block_device_context { static const char *drv_name = "blkvsc"; /* {32412632-86cb-44a2-9b5c-50d1417354f5} */ -static const struct hv_guid g_blk_device_type = { +static const struct hv_guid dev_type = { .data = { 0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44, 0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5 @@ -178,7 +178,7 @@ static int blk_vsc_initialize(struct hv_driver *driver) /* Make sure we are at least 2 pages since 1 page is used for control */ driver->name = drv_name; - memcpy(&driver->dev_type, &g_blk_device_type, sizeof(struct hv_guid)); + memcpy(&driver->dev_type, &dev_type, sizeof(struct hv_guid)); /*