From df5244e9f8404ee20409b7572500879b6b0d4bf0 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 10 May 2011 07:54:21 -0700 Subject: [PATCH] --- yaml --- r: 249477 b: refs/heads/master c: 97c1529623c794afebe5ef146e35441a507067ad h: refs/heads/master i: 249475: 9373102fb6b0fda084a2701e4f9bb6c646314515 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/storvsc_drv.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 17c792965084..9b9d471b4025 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 795b613d8b780a878abf086c667c59e604c99c27 +refs/heads/master: 97c1529623c794afebe5ef146e35441a507067ad diff --git a/trunk/drivers/staging/hv/storvsc_drv.c b/trunk/drivers/staging/hv/storvsc_drv.c index 2e2e00458122..c1832202c9b4 100644 --- a/trunk/drivers/staging/hv/storvsc_drv.c +++ b/trunk/drivers/staging/hv/storvsc_drv.c @@ -55,7 +55,7 @@ struct hv_host_device { /* must be 1st field * FIXME this is a bug */ /* point back to our device context */ - struct hv_device *device_ctx; + struct hv_device *dev; struct kmem_cache *request_pool; unsigned int port; unsigned char path; @@ -345,7 +345,7 @@ static int storvsc_probe(struct hv_device *device) memset(host_dev, 0, sizeof(struct hv_host_device)); host_dev->port = host->host_no; - host_dev->device_ctx = device; + host_dev->dev = device; host_dev->request_pool = kmem_cache_create(dev_name(&device->device), @@ -685,7 +685,7 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd, int ret; struct hv_host_device *host_dev = (struct hv_host_device *)scmnd->device->host->hostdata; - struct hv_device *device_ctx = host_dev->device_ctx; + struct hv_device *device_ctx = host_dev->dev; struct storvsc_driver *storvsc_drv_obj = drv_to_stordrv(device_ctx->device.driver); struct hv_storvsc_request *request; @@ -918,7 +918,7 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd) int ret; struct hv_host_device *host_dev = (struct hv_host_device *)scmnd->device->host->hostdata; - struct hv_device *device_ctx = host_dev->device_ctx; + struct hv_device *device_ctx = host_dev->dev; DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host resetting...", scmnd->device, device_ctx);