From 514d5a9586844867b038993c0a1b81199cbbafaf Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Fri, 22 Apr 2011 14:13:37 -0700 Subject: [PATCH] --- yaml --- r: 249122 b: refs/heads/master c: f84044d30eb8b4f39f141445b3ef417703c9de35 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/blkvsc_drv.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cc1ccf060cf3..afb3d1e87270 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1efe70583f2afebf673a8ba99909b6e0c827e33b +refs/heads/master: f84044d30eb8b4f39f141445b3ef417703c9de35 diff --git a/trunk/drivers/staging/hv/blkvsc_drv.c b/trunk/drivers/staging/hv/blkvsc_drv.c index a63778e40fda..f421208a187b 100644 --- a/trunk/drivers/staging/hv/blkvsc_drv.c +++ b/trunk/drivers/staging/hv/blkvsc_drv.c @@ -124,6 +124,14 @@ static const struct hv_guid g_blk_device_type = { */ static void blkvsc_request_completion(struct hv_storvsc_request *request); +static int blkvsc_ringbuffer_size = BLKVSC_RING_BUFFER_SIZE; + +/* + * There is a circular dependency involving blkvsc_probe() + * and block_ops. + */ +static int blkvsc_probe(struct device *dev); + static int blk_vsc_on_device_add(struct hv_device *device, void *additional_info) { @@ -1205,10 +1213,7 @@ static void blkvsc_request(struct request_queue *queue) } } -/* Static decl */ -static int blkvsc_probe(struct device *dev); -static int blkvsc_ringbuffer_size = BLKVSC_RING_BUFFER_SIZE; module_param(blkvsc_ringbuffer_size, int, S_IRUGO); MODULE_PARM_DESC(ring_size, "Ring buffer size (in bytes)");