From 20011e099f45d5ac352c07a7b16a6a908b478838 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Thu, 12 Jan 2012 12:37:58 -0800 Subject: [PATCH] --- yaml --- r: 288936 b: refs/heads/master c: 4b270c8b23722128adedb5694097aea367284ce1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/storvsc_drv.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 19b8a0491e63..37b439aa5544 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 160463204f541cea112fd4d68422f297bd98ec51 +refs/heads/master: 4b270c8b23722128adedb5694097aea367284ce1 diff --git a/trunk/drivers/staging/hv/storvsc_drv.c b/trunk/drivers/staging/hv/storvsc_drv.c index 979f25b33858..8340387b3781 100644 --- a/trunk/drivers/staging/hv/storvsc_drv.c +++ b/trunk/drivers/staging/hv/storvsc_drv.c @@ -1122,8 +1122,11 @@ static int storvsc_get_chs(struct scsi_device *sdev, struct block_device * bdev, return 0; } -static int storvsc_host_reset(struct hv_device *device) +static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd) { + struct hv_host_device *host_dev = shost_priv(scmnd->device->host); + struct hv_device *device = host_dev->dev; + struct storvsc_device *stor_device; struct hv_storvsc_request *request; struct vstor_packet *vstor_packet; @@ -1165,15 +1168,6 @@ static int storvsc_host_reset(struct hv_device *device) } -static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd) -{ - struct hv_host_device *host_dev = shost_priv(scmnd->device->host); - struct hv_device *dev = host_dev->dev; - - return storvsc_host_reset(dev); -} - - static void storvsc_command_completion(struct hv_storvsc_request *request) { struct storvsc_cmd_request *cmd_request =