From 8a280399b3396ded11bbdf74f7f3bba629e3b1df Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 1 Sep 2009 16:34:56 -0700 Subject: [PATCH] Staging: hv: coding style fixes for blkvsc_drv.c There are still some very long lines, someone needs to unwind the logic there to resolve that. Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/blkvsc_drv.c | 1053 +++++++++++++++++++-------------------- 1 file changed, 521 insertions(+), 532 deletions(-) diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 9e0dbd5..7c383ad 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -1,5 +1,4 @@ /* - * * Copyright (c) 2009, Microsoft Corporation. * * This program is free software; you can redistribute it and/or modify it @@ -17,9 +16,7 @@ * * Authors: * Hank Janssen - * */ - #include #include #include @@ -27,25 +24,18 @@ #include #include #include - #include #include #include #include - #include "osd.h" #include "logging.h" #include "vmbus.h" #include "StorVscApi.h" -/* #defines */ - #define BLKVSC_MINORS 64 - -/* Data types */ - enum blkvsc_device_type { UNKNOWN_DEV_TYPE, HARDDISK_TYPE, @@ -58,64 +48,74 @@ enum blkvsc_device_type { * represented by 1 or more struct blkvsc_request */ struct blkvsc_request_group { - int outstanding; - int status; - - struct list_head blkvsc_req_list; /* list of blkvsc_requests */ + int outstanding; + int status; + struct list_head blkvsc_req_list; /* list of blkvsc_requests */ }; - struct blkvsc_request { - struct list_head req_entry; /* blkvsc_request_group.blkvsc_req_list */ + /* blkvsc_request_group.blkvsc_req_list */ + struct list_head req_entry; + + /* block_device_context.pending_list */ + struct list_head pend_entry; + + /* This may be null if we generate a request internally */ + struct request *req; - struct list_head pend_entry; /* block_device_context.pending_list */ + struct block_device_context *dev; - struct request *req; /* This may be null if we generate a request internally */ - struct block_device_context *dev; - struct blkvsc_request_group *group; /* The group this request is part of. Maybe null */ + /* The group this request is part of. Maybe null */ + struct blkvsc_request_group *group; - wait_queue_head_t wevent; + wait_queue_head_t wevent; int cond; - int write; - sector_t sector_start; - unsigned long sector_count; + int write; + sector_t sector_start; + unsigned long sector_count; unsigned char sense_buffer[SCSI_SENSE_BUFFERSIZE]; unsigned char cmd_len; unsigned char cmnd[MAX_COMMAND_SIZE]; struct hv_storvsc_request request; - /* !!!DO NOT ADD ANYTHING BELOW HERE!!! Otherwise, memory can overlap, because - */ - /* The extension buffer falls right here and is pointed to by request.Extension; */ + /* + * !!!DO NOT ADD ANYTHING BELOW HERE!!! Otherwise, memory can overlap, + * because - The extension buffer falls right here and is pointed to by + * request.Extension; + * Which sounds like a horrible idea, who designed this? + */ }; /* Per device structure */ struct block_device_context { - struct device_context *device_ctx; /* point back to our device context */ - struct kmem_cache *request_pool; - spinlock_t lock; - struct gendisk *gd; + /* point back to our device context */ + struct device_context *device_ctx; + struct kmem_cache *request_pool; + spinlock_t lock; + struct gendisk *gd; enum blkvsc_device_type device_type; - struct list_head pending_list; - - unsigned char device_id[64]; - unsigned int device_id_len; - int num_outstanding_reqs; - int shutting_down; - int media_not_present; - unsigned int sector_size; - sector_t capacity; - unsigned int port; - unsigned char path; - unsigned char target; - int users; + struct list_head pending_list; + + unsigned char device_id[64]; + unsigned int device_id_len; + int num_outstanding_reqs; + int shutting_down; + int media_not_present; + unsigned int sector_size; + sector_t capacity; + unsigned int port; + unsigned char path; + unsigned char target; + int users; }; /* Per driver */ struct blkvsc_driver_context { /* !! These must be the first 2 fields !! */ - struct driver_context drv_ctx; + /* FIXME this is a bug! */ + struct driver_context drv_ctx; struct storvsc_driver_object drv_obj; }; @@ -133,8 +133,10 @@ static int blkvsc_ioctl(struct block_device *bd, fmode_t mode, unsigned cmd, unsigned long argument); static void blkvsc_request(struct request_queue *queue); static void blkvsc_request_completion(struct hv_storvsc_request *request); -static int blkvsc_do_request(struct block_device_context *blkdev, struct request *req); -static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req, void (*request_completion)(struct hv_storvsc_request*) ); +static int blkvsc_do_request(struct block_device_context *blkdev, + struct request *req); +static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req, + void (*request_completion)(struct hv_storvsc_request *)); static void blkvsc_init_rw(struct blkvsc_request *blkvsc_req); static void blkvsc_cmd_completion(struct hv_storvsc_request *request); static int blkvsc_do_inquiry(struct block_device_context *blkdev); @@ -150,9 +152,7 @@ static int blkvsc_ringbuffer_size = BLKVSC_RING_BUFFER_SIZE; /* The one and only one */ static struct blkvsc_driver_context g_blkvsc_drv; - -static struct block_device_operations block_ops = -{ +static struct block_device_operations block_ops = { .owner = THIS_MODULE, .open = blkvsc_open, .release = blkvsc_release, @@ -162,18 +162,14 @@ static struct block_device_operations block_ops = .ioctl = blkvsc_ioctl, }; -/*++ - -Name: blkvsc_drv_init() - -Desc: BlkVsc driver initialization. - ---*/ +/** + * blkvsc_drv_init - BlkVsc driver initialization. + */ static int blkvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init) { - int ret=0; struct storvsc_driver_object *storvsc_drv_obj = &g_blkvsc_drv.drv_obj; - struct driver_context *drv_ctx=&g_blkvsc_drv.drv_ctx; + struct driver_context *drv_ctx = &g_blkvsc_drv.drv_ctx; + int ret; DPRINT_ENTER(BLKVSC_DRV); @@ -185,7 +181,8 @@ static int blkvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init) pfn_drv_init(&storvsc_drv_obj->Base); drv_ctx->driver.name = storvsc_drv_obj->Base.name; - memcpy(&drv_ctx->class_id, &storvsc_drv_obj->Base.deviceType, sizeof(struct hv_guid)); + memcpy(&drv_ctx->class_id, &storvsc_drv_obj->Base.deviceType, + sizeof(struct hv_guid)); drv_ctx->probe = blkvsc_probe; drv_ctx->remove = blkvsc_remove; @@ -199,7 +196,6 @@ static int blkvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init) return ret; } - static int blkvsc_drv_exit_cb(struct device *dev, void *data) { struct device **curr = (struct device **)data; @@ -207,24 +203,16 @@ static int blkvsc_drv_exit_cb(struct device *dev, void *data) return 1; /* stop iterating */ } -/*++ - -Name: blkvsc_drv_exit() - -Desc: - ---*/ static void blkvsc_drv_exit(void) { struct storvsc_driver_object *storvsc_drv_obj = &g_blkvsc_drv.drv_obj; - struct driver_context *drv_ctx=&g_blkvsc_drv.drv_ctx; - struct device *current_dev=NULL; + struct driver_context *drv_ctx = &g_blkvsc_drv.drv_ctx; + struct device *current_dev; int ret; DPRINT_ENTER(BLKVSC_DRV); - while (1) - { + while (1) { current_dev = NULL; /* Get the device */ @@ -254,47 +242,40 @@ static void blkvsc_drv_exit(void) return; } -/*++ - -Name: blkvsc_probe() - -Desc: Add a new device for this driver - ---*/ +/** + * blkvsc_probe - Add a new device for this driver + */ static int blkvsc_probe(struct device *device) { - int ret=0; - - struct driver_context *driver_ctx = driver_to_driver_context(device->driver); - struct blkvsc_driver_context *blkvsc_drv_ctx = (struct blkvsc_driver_context*)driver_ctx; - struct storvsc_driver_object *storvsc_drv_obj = &blkvsc_drv_ctx->drv_obj; - + struct driver_context *driver_ctx = + driver_to_driver_context(device->driver); + struct blkvsc_driver_context *blkvsc_drv_ctx = + (struct blkvsc_driver_context *)driver_ctx; + struct storvsc_driver_object *storvsc_drv_obj = + &blkvsc_drv_ctx->drv_obj; struct device_context *device_ctx = device_to_device_context(device); struct hv_device *device_obj = &device_ctx->device_obj; - struct block_device_context *blkdev=NULL; + struct block_device_context *blkdev = NULL; struct storvsc_device_info device_info; - int major=0; - int devnum=0; - - static int ide0_registered=0; - static int ide1_registered=0; + int major = 0; + int devnum = 0; + int ret = 0; + static int ide0_registered; + static int ide1_registered; DPRINT_ENTER(BLKVSC_DRV); DPRINT_DBG(BLKVSC_DRV, "blkvsc_probe - enter"); - if (!storvsc_drv_obj->Base.OnDeviceAdd) - { + if (!storvsc_drv_obj->Base.OnDeviceAdd) { DPRINT_ERR(BLKVSC_DRV, "OnDeviceAdd() not set"); - ret = -1; goto Cleanup; } blkdev = kzalloc(sizeof(struct block_device_context), GFP_KERNEL); - if (!blkdev) - { + if (!blkdev) { ret = -ENOMEM; goto Cleanup; } @@ -304,13 +285,14 @@ static int blkvsc_probe(struct device *device) /* Initialize what we can here */ spin_lock_init(&blkdev->lock); - ASSERT(sizeof(struct blkvsc_request_group) <= sizeof(struct blkvsc_request)); + ASSERT(sizeof(struct blkvsc_request_group) <= + sizeof(struct blkvsc_request)); blkdev->request_pool = kmem_cache_create(dev_name(&device_ctx->device), - sizeof(struct blkvsc_request) + storvsc_drv_obj->RequestExtSize, 0, - SLAB_HWCACHE_ALIGN, NULL); - if (!blkdev->request_pool) - { + sizeof(struct blkvsc_request) + + storvsc_drv_obj->RequestExtSize, 0, + SLAB_HWCACHE_ALIGN, NULL); + if (!blkdev->request_pool) { ret = -ENOMEM; goto Cleanup; } @@ -318,56 +300,51 @@ static int blkvsc_probe(struct device *device) /* Call to the vsc driver to add the device */ ret = storvsc_drv_obj->Base.OnDeviceAdd(device_obj, &device_info); - if (ret != 0) - { + if (ret != 0) { DPRINT_ERR(BLKVSC_DRV, "unable to add blkvsc device"); goto Cleanup; } blkdev->device_ctx = device_ctx; - blkdev->target = device_info.TargetId; /* this identified the device 0 or 1 */ - blkdev->path = device_info.PathId; /* this identified the ide ctrl 0 or 1 */ + /* this identified the device 0 or 1 */ + blkdev->target = device_info.TargetId; + /* this identified the ide ctrl 0 or 1 */ + blkdev->path = device_info.PathId; dev_set_drvdata(device, blkdev); /* Calculate the major and device num */ - if (blkdev->path == 0) - { + if (blkdev->path == 0) { major = IDE0_MAJOR; devnum = blkdev->path + blkdev->target; /* 0 or 1 */ - if (!ide0_registered) - { + if (!ide0_registered) { ret = register_blkdev(major, "ide"); - if (ret != 0) - { - DPRINT_ERR(BLKVSC_DRV, "register_blkdev() failed! ret %d", ret); + if (ret != 0) { + DPRINT_ERR(BLKVSC_DRV, + "register_blkdev() failed! ret %d", + ret); goto Remove; } ide0_registered = 1; } - } - else if (blkdev->path == 1) - { + } else if (blkdev->path == 1) { major = IDE1_MAJOR; devnum = blkdev->path + blkdev->target + 1; /* 2 or 3 */ - if (!ide1_registered) - { + if (!ide1_registered) { ret = register_blkdev(major, "ide"); - if (ret != 0) - { - DPRINT_ERR(BLKVSC_DRV, "register_blkdev() failed! ret %d", ret); + if (ret != 0) { + DPRINT_ERR(BLKVSC_DRV, + "register_blkdev() failed! ret %d", + ret); goto Remove; } ide1_registered = 1; } - - } - else - { + } else { DPRINT_ERR(BLKVSC_DRV, "invalid pathid"); ret = -1; goto Cleanup; @@ -376,8 +353,7 @@ static int blkvsc_probe(struct device *device) DPRINT_INFO(BLKVSC_DRV, "blkvsc registered for major %d!!", major); blkdev->gd = alloc_disk(BLKVSC_MINORS); - if (!blkdev->gd) - { + if (!blkdev->gd) { DPRINT_ERR(BLKVSC_DRV, "register_blkdev() failed! ret %d", ret); ret = -1; goto Cleanup; @@ -386,8 +362,10 @@ static int blkvsc_probe(struct device *device) blkdev->gd->queue = blk_init_queue(blkvsc_request, &blkdev->lock); blk_queue_max_segment_size(blkdev->gd->queue, PAGE_SIZE); - blk_queue_max_phys_segments(blkdev->gd->queue, MAX_MULTIPAGE_BUFFER_COUNT); - blk_queue_max_hw_segments(blkdev->gd->queue, MAX_MULTIPAGE_BUFFER_COUNT); + blk_queue_max_phys_segments(blkdev->gd->queue, + MAX_MULTIPAGE_BUFFER_COUNT); + blk_queue_max_hw_segments(blkdev->gd->queue, + MAX_MULTIPAGE_BUFFER_COUNT); blk_queue_segment_boundary(blkdev->gd->queue, PAGE_SIZE-1); blk_queue_bounce_limit(blkdev->gd->queue, BLK_BOUNCE_ANY); blk_queue_dma_alignment(blkdev->gd->queue, 511); @@ -399,17 +377,14 @@ static int blkvsc_probe(struct device *device) blkdev->gd->first_minor = 0; blkdev->gd->fops = &block_ops; blkdev->gd->private_data = blkdev; - sprintf(blkdev->gd->disk_name, "hd%c", 'a'+ devnum); + sprintf(blkdev->gd->disk_name, "hd%c", 'a' + devnum); blkvsc_do_inquiry(blkdev); - if (blkdev->device_type == DVD_TYPE) - { + if (blkdev->device_type == DVD_TYPE) { set_disk_ro(blkdev->gd, 1); blkdev->gd->flags |= GENHD_FL_REMOVABLE; blkvsc_do_read_capacity(blkdev); - } - else - { + } else { blkvsc_do_read_capacity16(blkdev); } @@ -418,7 +393,9 @@ static int blkvsc_probe(struct device *device) /* go! */ add_disk(blkdev->gd); - DPRINT_INFO(BLKVSC_DRV, "%s added!! capacity %lu sector_size %d", blkdev->gd->disk_name, (unsigned long) blkdev->capacity, blkdev->sector_size); + DPRINT_INFO(BLKVSC_DRV, "%s added!! capacity %lu sector_size %d", + blkdev->gd->disk_name, (unsigned long)blkdev->capacity, + blkdev->sector_size); return ret; @@ -426,10 +403,8 @@ Remove: storvsc_drv_obj->Base.OnDeviceRemove(device_obj); Cleanup: - if (blkdev) - { - if (blkdev->request_pool) - { + if (blkdev) { + if (blkdev->request_pool) { kmem_cache_destroy(blkdev->request_pool); blkdev->request_pool = NULL; } @@ -450,7 +425,8 @@ static void blkvsc_shutdown(struct device *device) if (!blkdev) return; - DPRINT_DBG(BLKVSC_DRV, "blkvsc_shutdown - users %d disk %s\n", blkdev->users, blkdev->gd->disk_name); + DPRINT_DBG(BLKVSC_DRV, "blkvsc_shutdown - users %d disk %s\n", + blkdev->users, blkdev->gd->disk_name); spin_lock_irqsave(&blkdev->lock, flags); @@ -460,10 +436,9 @@ static void blkvsc_shutdown(struct device *device) spin_unlock_irqrestore(&blkdev->lock, flags); - while (blkdev->num_outstanding_reqs) - { - DPRINT_INFO(STORVSC, "waiting for %d requests to complete...", blkdev->num_outstanding_reqs); - + while (blkdev->num_outstanding_reqs) { + DPRINT_INFO(STORVSC, "waiting for %d requests to complete...", + blkdev->num_outstanding_reqs); udelay(100); } @@ -478,7 +453,7 @@ static void blkvsc_shutdown(struct device *device) static int blkvsc_do_flush(struct block_device_context *blkdev) { - struct blkvsc_request *blkvsc_req=NULL; + struct blkvsc_request *blkvsc_req; DPRINT_DBG(BLKVSC_DRV, "blkvsc_do_flush()\n"); @@ -487,9 +462,7 @@ static int blkvsc_do_flush(struct block_device_context *blkdev) blkvsc_req = kmem_cache_alloc(blkdev->request_pool, GFP_KERNEL); if (!blkvsc_req) - { return -ENOMEM; - } memset(blkvsc_req, 0, sizeof(struct blkvsc_request)); init_waitqueue_head(&blkvsc_req->wevent); @@ -504,8 +477,11 @@ static int blkvsc_do_flush(struct block_device_context *blkdev) blkvsc_req->cmnd[0] = SYNCHRONIZE_CACHE; blkvsc_req->cmd_len = 10; - /* Set this here since the completion routine may be invoked and completed before we return */ - blkvsc_req->cond =0; + /* + * Set this here since the completion routine may be invoked and + * completed before we return + */ + blkvsc_req->cond = 0; blkvsc_submit_request(blkvsc_req, blkvsc_cmd_completion); wait_event_interruptible(blkvsc_req->wevent, blkvsc_req->cond); @@ -518,7 +494,7 @@ static int blkvsc_do_flush(struct block_device_context *blkdev) /* Do a scsi INQUIRY cmd here to get the device type (ie disk or dvd) */ static int blkvsc_do_inquiry(struct block_device_context *blkdev) { - struct blkvsc_request *blkvsc_req=NULL; + struct blkvsc_request *blkvsc_req; struct page *page_buf; unsigned char *buf; unsigned char device_type; @@ -527,14 +503,11 @@ static int blkvsc_do_inquiry(struct block_device_context *blkdev) blkvsc_req = kmem_cache_alloc(blkdev->request_pool, GFP_KERNEL); if (!blkvsc_req) - { return -ENOMEM; - } memset(blkvsc_req, 0, sizeof(struct blkvsc_request)); page_buf = alloc_page(GFP_KERNEL); - if (!page_buf) - { + if (!page_buf) { kmem_cache_free(blkvsc_req->dev->request_pool, blkvsc_req); return -ENOMEM; } @@ -554,12 +527,16 @@ static int blkvsc_do_inquiry(struct block_device_context *blkdev) blkvsc_req->cmnd[4] = 64; blkvsc_req->cmd_len = 6; - /* Set this here since the completion routine may be invoked and completed before we return */ - blkvsc_req->cond =0; + /* + * Set this here since the completion routine may be invoked and + * completed before we return + */ + blkvsc_req->cond = 0; blkvsc_submit_request(blkvsc_req, blkvsc_cmd_completion); - DPRINT_DBG(BLKVSC_DRV, "waiting %p to complete - cond %d\n", blkvsc_req, blkvsc_req->cond); + DPRINT_DBG(BLKVSC_DRV, "waiting %p to complete - cond %d\n", + blkvsc_req, blkvsc_req->cond); wait_event_interruptible(blkvsc_req->wevent, blkvsc_req->cond); @@ -569,16 +546,11 @@ static int blkvsc_do_inquiry(struct block_device_context *blkdev) /* be to le */ device_type = buf[0] & 0x1F; - if (device_type == 0x0) - { + if (device_type == 0x0) { blkdev->device_type = HARDDISK_TYPE; - } - else if (device_type == 0x5) - { + } else if (device_type == 0x5) { blkdev->device_type = DVD_TYPE; - } - else - { + } else { /* TODO: this is currently unsupported device type */ blkdev->device_type = UNKNOWN_DEV_TYPE; } @@ -605,7 +577,7 @@ static int blkvsc_do_inquiry(struct block_device_context *blkdev) /* Do a scsi READ_CAPACITY cmd here to get the size of the disk */ static int blkvsc_do_read_capacity(struct block_device_context *blkdev) { - struct blkvsc_request *blkvsc_req=NULL; + struct blkvsc_request *blkvsc_req; struct page *page_buf; unsigned char *buf; struct scsi_sense_hdr sense_hdr; @@ -618,14 +590,11 @@ static int blkvsc_do_read_capacity(struct block_device_context *blkdev) blkvsc_req = kmem_cache_alloc(blkdev->request_pool, GFP_KERNEL); if (!blkvsc_req) - { return -ENOMEM; - } memset(blkvsc_req, 0, sizeof(struct blkvsc_request)); page_buf = alloc_page(GFP_KERNEL); - if (!page_buf) - { + if (!page_buf) { kmem_cache_free(blkvsc_req->dev->request_pool, blkvsc_req); return -ENOMEM; } @@ -646,31 +615,33 @@ static int blkvsc_do_read_capacity(struct block_device_context *blkdev) * Set this here since the completion routine may be invoked * and completed before we return */ - blkvsc_req->cond =0; + blkvsc_req->cond = 0; blkvsc_submit_request(blkvsc_req, blkvsc_cmd_completion); - DPRINT_DBG(BLKVSC_DRV, "waiting %p to complete - cond %d\n", blkvsc_req, blkvsc_req->cond); + DPRINT_DBG(BLKVSC_DRV, "waiting %p to complete - cond %d\n", + blkvsc_req, blkvsc_req->cond); wait_event_interruptible(blkvsc_req->wevent, blkvsc_req->cond); /* check error */ - if (blkvsc_req->request.Status) - { - scsi_normalize_sense(blkvsc_req->sense_buffer, SCSI_SENSE_BUFFERSIZE, &sense_hdr); + if (blkvsc_req->request.Status) { + scsi_normalize_sense(blkvsc_req->sense_buffer, + SCSI_SENSE_BUFFERSIZE, &sense_hdr); - if (sense_hdr.asc == 0x3A) /* Medium not present */ - { + if (sense_hdr.asc == 0x3A) { + /* Medium not present */ blkdev->media_not_present = 1; } - return 0; } buf = kmap(page_buf); /* be to le */ - blkdev->capacity = ((buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]) + 1; - blkdev->sector_size = (buf[4] << 24) | (buf[5] << 16) | (buf[6] << 8) | buf[7]; + blkdev->capacity = ((buf[0] << 24) | (buf[1] << 16) | + (buf[2] << 8) | buf[3]) + 1; + blkdev->sector_size = (buf[4] << 24) | (buf[5] << 16) | + (buf[6] << 8) | buf[7]; kunmap(page_buf); @@ -681,10 +652,9 @@ static int blkvsc_do_read_capacity(struct block_device_context *blkdev) return 0; } - static int blkvsc_do_read_capacity16(struct block_device_context *blkdev) { - struct blkvsc_request *blkvsc_req=NULL; + struct blkvsc_request *blkvsc_req; struct page *page_buf; unsigned char *buf; struct scsi_sense_hdr sense_hdr; @@ -697,14 +667,11 @@ static int blkvsc_do_read_capacity16(struct block_device_context *blkdev) blkvsc_req = kmem_cache_alloc(blkdev->request_pool, GFP_KERNEL); if (!blkvsc_req) - { return -ENOMEM; - } memset(blkvsc_req, 0, sizeof(struct blkvsc_request)); page_buf = alloc_page(GFP_KERNEL); - if (!page_buf) - { + if (!page_buf) { kmem_cache_free(blkvsc_req->dev->request_pool, blkvsc_req); return -ENOMEM; } @@ -725,34 +692,37 @@ static int blkvsc_do_read_capacity16(struct block_device_context *blkdev) * Set this here since the completion routine may be invoked * and completed before we return */ - blkvsc_req->cond =0; + blkvsc_req->cond = 0; blkvsc_submit_request(blkvsc_req, blkvsc_cmd_completion); - DPRINT_DBG(BLKVSC_DRV, "waiting %p to complete - cond %d\n", blkvsc_req, blkvsc_req->cond); + DPRINT_DBG(BLKVSC_DRV, "waiting %p to complete - cond %d\n", + blkvsc_req, blkvsc_req->cond); wait_event_interruptible(blkvsc_req->wevent, blkvsc_req->cond); /* check error */ - if (blkvsc_req->request.Status) - { - scsi_normalize_sense(blkvsc_req->sense_buffer, SCSI_SENSE_BUFFERSIZE, &sense_hdr); - - if (sense_hdr.asc == 0x3A) /* Medium not present */ - { + if (blkvsc_req->request.Status) { + scsi_normalize_sense(blkvsc_req->sense_buffer, + SCSI_SENSE_BUFFERSIZE, &sense_hdr); + if (sense_hdr.asc == 0x3A) { + /* Medium not present */ blkdev->media_not_present = 1; } - return 0; } buf = kmap(page_buf); /* be to le */ - blkdev->capacity = be64_to_cpu(*(unsigned long long*) &buf[0]) + 1; - blkdev->sector_size = be32_to_cpu(*(unsigned int*)&buf[8]); + blkdev->capacity = be64_to_cpu(*(unsigned long long *) &buf[0]) + 1; + blkdev->sector_size = be32_to_cpu(*(unsigned int *)&buf[8]); - /* blkdev->capacity = ((buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]) + 1; */ - /* blkdev->sector_size = (buf[4] << 24) | (buf[5] << 16) | (buf[6] << 8) | buf[7]; */ +#if 0 + blkdev->capacity = ((buf[0] << 24) | (buf[1] << 16) | + (buf[2] << 8) | buf[3]) + 1; + blkdev->sector_size = (buf[4] << 24) | (buf[5] << 16) | + (buf[6] << 8) | buf[7]; +#endif kunmap(page_buf); @@ -763,42 +733,41 @@ static int blkvsc_do_read_capacity16(struct block_device_context *blkdev) return 0; } -/*++ - -Name: blkvsc_remove() - -Desc: Callback when our device is removed - ---*/ +/** + * blkvsc_remove() - Callback when our device is removed + */ static int blkvsc_remove(struct device *device) { - int ret=0; - - struct driver_context *driver_ctx = driver_to_driver_context(device->driver); - struct blkvsc_driver_context *blkvsc_drv_ctx = (struct blkvsc_driver_context*)driver_ctx; - struct storvsc_driver_object *storvsc_drv_obj = &blkvsc_drv_ctx->drv_obj; - + struct driver_context *driver_ctx = + driver_to_driver_context(device->driver); + struct blkvsc_driver_context *blkvsc_drv_ctx = + (struct blkvsc_driver_context *)driver_ctx; + struct storvsc_driver_object *storvsc_drv_obj = + &blkvsc_drv_ctx->drv_obj; struct device_context *device_ctx = device_to_device_context(device); struct hv_device *device_obj = &device_ctx->device_obj; struct block_device_context *blkdev = dev_get_drvdata(device); unsigned long flags; + int ret; DPRINT_ENTER(BLKVSC_DRV); DPRINT_DBG(BLKVSC_DRV, "blkvsc_remove()\n"); - if (!storvsc_drv_obj->Base.OnDeviceRemove) - { + if (!storvsc_drv_obj->Base.OnDeviceRemove) { DPRINT_EXIT(BLKVSC_DRV); return -1; } - /* Call to the vsc driver to let it know that the device is being removed */ + /* + * Call to the vsc driver to let it know that the device is being + * removed + */ ret = storvsc_drv_obj->Base.OnDeviceRemove(device_obj); - if (ret != 0) - { + if (ret != 0) { /* TODO: */ - DPRINT_ERR(BLKVSC_DRV, "unable to remove blkvsc device (ret %d)", ret); + DPRINT_ERR(BLKVSC_DRV, + "unable to remove blkvsc device (ret %d)", ret); } /* Get to a known state */ @@ -810,10 +779,9 @@ static int blkvsc_remove(struct device *device) spin_unlock_irqrestore(&blkdev->lock, flags); - while (blkdev->num_outstanding_reqs) - { - DPRINT_INFO(STORVSC, "waiting for %d requests to complete...", blkdev->num_outstanding_reqs); - + while (blkdev->num_outstanding_reqs) { + DPRINT_INFO(STORVSC, "waiting for %d requests to complete...", + blkdev->num_outstanding_reqs); udelay(100); } @@ -845,92 +813,89 @@ static void blkvsc_init_rw(struct blkvsc_request *blkvsc_req) blkvsc_req->cmd_len = 16; - if (blkvsc_req->sector_start > 0xffffffff) - { - if (rq_data_dir(blkvsc_req->req)) - { + if (blkvsc_req->sector_start > 0xffffffff) { + if (rq_data_dir(blkvsc_req->req)) { blkvsc_req->write = 1; blkvsc_req->cmnd[0] = WRITE_16; - } - else - { + } else { blkvsc_req->write = 0; blkvsc_req->cmnd[0] = READ_16; } blkvsc_req->cmnd[1] |= blk_fua_rq(blkvsc_req->req) ? 0x8 : 0; - *(unsigned long long*)&blkvsc_req->cmnd[2] = cpu_to_be64(blkvsc_req->sector_start); - *(unsigned int*)&blkvsc_req->cmnd[10] = cpu_to_be32(blkvsc_req->sector_count); - } - else if ((blkvsc_req->sector_count > 0xff) || (blkvsc_req->sector_start > 0x1fffff)) - { - if (rq_data_dir(blkvsc_req->req)) - { + *(unsigned long long *)&blkvsc_req->cmnd[2] = + cpu_to_be64(blkvsc_req->sector_start); + *(unsigned int *)&blkvsc_req->cmnd[10] = + cpu_to_be32(blkvsc_req->sector_count); + } else if ((blkvsc_req->sector_count > 0xff) || + (blkvsc_req->sector_start > 0x1fffff)) { + if (rq_data_dir(blkvsc_req->req)) { blkvsc_req->write = 1; blkvsc_req->cmnd[0] = WRITE_10; - } - else - { + } else { blkvsc_req->write = 0; blkvsc_req->cmnd[0] = READ_10; } blkvsc_req->cmnd[1] |= blk_fua_rq(blkvsc_req->req) ? 0x8 : 0; - *(unsigned int *)&blkvsc_req->cmnd[2] = cpu_to_be32(blkvsc_req->sector_start); - *(unsigned short*)&blkvsc_req->cmnd[7] = cpu_to_be16(blkvsc_req->sector_count); - } - else - { - if (rq_data_dir(blkvsc_req->req)) - { + *(unsigned int *)&blkvsc_req->cmnd[2] = + cpu_to_be32(blkvsc_req->sector_start); + *(unsigned short *)&blkvsc_req->cmnd[7] = + cpu_to_be16(blkvsc_req->sector_count); + } else { + if (rq_data_dir(blkvsc_req->req)) { blkvsc_req->write = 1; blkvsc_req->cmnd[0] = WRITE_6; - } - else - { + } else { blkvsc_req->write = 0; blkvsc_req->cmnd[0] = READ_6; } - *(unsigned int *)&blkvsc_req->cmnd[1] = cpu_to_be32(blkvsc_req->sector_start) >> 8; + *(unsigned int *)&blkvsc_req->cmnd[1] = + cpu_to_be32(blkvsc_req->sector_start) >> 8; blkvsc_req->cmnd[1] &= 0x1f; - blkvsc_req->cmnd[4] = (unsigned char) blkvsc_req->sector_count; + blkvsc_req->cmnd[4] = (unsigned char)blkvsc_req->sector_count; } } -static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req, void (*request_completion)(struct hv_storvsc_request*) ) +static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req, + void (*request_completion)(struct hv_storvsc_request *)) { struct block_device_context *blkdev = blkvsc_req->dev; - struct device_context *device_ctx=blkdev->device_ctx; - struct driver_context *driver_ctx = driver_to_driver_context(device_ctx->device.driver); - struct blkvsc_driver_context *blkvsc_drv_ctx = (struct blkvsc_driver_context*)driver_ctx; - struct storvsc_driver_object *storvsc_drv_obj = &blkvsc_drv_ctx->drv_obj; - int ret =0; - + struct device_context *device_ctx = blkdev->device_ctx; + struct driver_context *driver_ctx = + driver_to_driver_context(device_ctx->device.driver); + struct blkvsc_driver_context *blkvsc_drv_ctx = + (struct blkvsc_driver_context *)driver_ctx; + struct storvsc_driver_object *storvsc_drv_obj = + &blkvsc_drv_ctx->drv_obj; struct hv_storvsc_request *storvsc_req; + int ret; - DPRINT_DBG(BLKVSC_DRV, "blkvsc_submit_request() - req %p type %s start_sector %lu count %ld offset %d len %d\n", - blkvsc_req, - (blkvsc_req->write)?"WRITE":"READ", - (unsigned long) blkvsc_req->sector_start, - blkvsc_req->sector_count, - blkvsc_req->request.DataBuffer.Offset, - blkvsc_req->request.DataBuffer.Length); - - /*for (i=0; i < (blkvsc_req->request.DataBuffer.Length >> 12); i++) - { - DPRINT_DBG(BLKVSC_DRV, "blkvsc_submit_request() - req %p pfn[%d] %llx\n", - blkvsc_req, - i, - blkvsc_req->request.DataBuffer.PfnArray[i]); - }*/ + DPRINT_DBG(BLKVSC_DRV, "blkvsc_submit_request() - " + "req %p type %s start_sector %lu count %ld offset %d " + "len %d\n", blkvsc_req, + (blkvsc_req->write) ? "WRITE" : "READ", + (unsigned long) blkvsc_req->sector_start, + blkvsc_req->sector_count, + blkvsc_req->request.DataBuffer.Offset, + blkvsc_req->request.DataBuffer.Length); +#if 0 + for (i = 0; i < (blkvsc_req->request.DataBuffer.Length >> 12); i++) { + DPRINT_DBG(BLKVSC_DRV, "blkvsc_submit_request() - " + "req %p pfn[%d] %llx\n", + blkvsc_req, i, + blkvsc_req->request.DataBuffer.PfnArray[i]); + } +#endif storvsc_req = &blkvsc_req->request; - storvsc_req->Extension = (void*)((unsigned long)blkvsc_req + sizeof(struct blkvsc_request)); + storvsc_req->Extension = (void *)((unsigned long)blkvsc_req + + sizeof(struct blkvsc_request)); - storvsc_req->Type = blkvsc_req->write? WRITE_TYPE : READ_TYPE; + storvsc_req->Type = blkvsc_req->write ? WRITE_TYPE : READ_TYPE; storvsc_req->OnIOCompletion = request_completion; storvsc_req->Context = blkvsc_req; @@ -946,47 +911,42 @@ static int blkvsc_submit_request(struct blkvsc_request *blkvsc_req, void (*reque storvsc_req->SenseBuffer = blkvsc_req->sense_buffer; storvsc_req->SenseBufferSize = SCSI_SENSE_BUFFERSIZE; - ret = storvsc_drv_obj->OnIORequest(&blkdev->device_ctx->device_obj, &blkvsc_req->request); + ret = storvsc_drv_obj->OnIORequest(&blkdev->device_ctx->device_obj, + &blkvsc_req->request); if (ret == 0) - { blkdev->num_outstanding_reqs++; - } return ret; } - /* * We break the request into 1 or more blkvsc_requests and submit * them. If we cant submit them all, we put them on the * pending_list. The blkvsc_request() will work on the pending_list. */ - -static int blkvsc_do_request(struct block_device_context *blkdev, struct request *req) +static int blkvsc_do_request(struct block_device_context *blkdev, + struct request *req) { - struct bio *bio=NULL; - struct bio_vec *bvec=NULL; - struct bio_vec *prev_bvec=NULL; - - struct blkvsc_request *blkvsc_req=NULL; + struct bio *bio = NULL; + struct bio_vec *bvec = NULL; + struct bio_vec *prev_bvec = NULL; + struct blkvsc_request *blkvsc_req = NULL; struct blkvsc_request *tmp; - int databuf_idx=0; - int seg_idx=0; - + int databuf_idx = 0; + int seg_idx = 0; sector_t start_sector; unsigned long num_sectors = 0; - int ret=0; - int pending=0; - struct blkvsc_request_group *group=NULL; + int ret = 0; + int pending = 0; + struct blkvsc_request_group *group = NULL; - DPRINT_DBG(BLKVSC_DRV, "blkdev %p req %p sect %lu \n", blkdev, req, (unsigned long) blk_rq_pos(req)); + DPRINT_DBG(BLKVSC_DRV, "blkdev %p req %p sect %lu \n", blkdev, req, + (unsigned long)blk_rq_pos(req)); /* Create a group to tie req to list of blkvsc_reqs */ - group = (struct blkvsc_request_group*)kmem_cache_alloc(blkdev->request_pool, GFP_ATOMIC); + group = kmem_cache_alloc(blkdev->request_pool, GFP_ATOMIC); if (!group) - { return -ENOMEM; - } INIT_LIST_HEAD(&group->blkvsc_req_list); group->outstanding = group->status = 0; @@ -994,110 +954,131 @@ static int blkvsc_do_request(struct block_device_context *blkdev, struct request start_sector = blk_rq_pos(req); /* foreach bio in the request */ - if (req->bio) - for (bio = req->bio; bio; bio = bio->bi_next) - { - /* Map this bio into an existing or new storvsc request */ - bio_for_each_segment (bvec, bio, seg_idx) - { - DPRINT_DBG(BLKVSC_DRV, "bio_for_each_segment() - req %p bio %p bvec %p seg_idx %d databuf_idx %d\n", - req, bio, bvec, seg_idx, databuf_idx); - - /* Get a new storvsc request */ - if ( (!blkvsc_req) || /* 1st-time */ - (databuf_idx >= MAX_MULTIPAGE_BUFFER_COUNT) || - (bvec->bv_offset != 0) || /* hole at the begin of page */ - (prev_bvec && (prev_bvec->bv_len != PAGE_SIZE)) ) /* hold at the end of page */ - { - /* submit the prev one */ - if (blkvsc_req) - { - blkvsc_req->sector_start = start_sector; - sector_div(blkvsc_req->sector_start, (blkdev->sector_size >> 9)); - - blkvsc_req->sector_count = num_sectors / (blkdev->sector_size >> 9); - - blkvsc_init_rw(blkvsc_req); - } - - /* Create new blkvsc_req to represent the current bvec */ - blkvsc_req = kmem_cache_alloc(blkdev->request_pool, GFP_ATOMIC); - if (!blkvsc_req) - { - /* free up everything */ - list_for_each_entry_safe(blkvsc_req, tmp, &group->blkvsc_req_list, req_entry) - { - list_del(&blkvsc_req->req_entry); - kmem_cache_free(blkdev->request_pool, blkvsc_req); + if (req->bio) { + for (bio = req->bio; bio; bio = bio->bi_next) { + /* + * Map this bio into an existing or new storvsc request + */ + bio_for_each_segment(bvec, bio, seg_idx) { + DPRINT_DBG(BLKVSC_DRV, "bio_for_each_segment() " + "- req %p bio %p bvec %p seg_idx %d " + "databuf_idx %d\n", req, bio, bvec, + seg_idx, databuf_idx); + + /* Get a new storvsc request */ + /* 1st-time */ + if ((!blkvsc_req) || + (databuf_idx >= MAX_MULTIPAGE_BUFFER_COUNT) + /* hole at the begin of page */ + || (bvec->bv_offset != 0) || + /* hold at the end of page */ + (prev_bvec && + (prev_bvec->bv_len != PAGE_SIZE))) { + /* submit the prev one */ + if (blkvsc_req) { + blkvsc_req->sector_start = start_sector; + sector_div(blkvsc_req->sector_start, (blkdev->sector_size >> 9)); + + blkvsc_req->sector_count = num_sectors / (blkdev->sector_size >> 9); + blkvsc_init_rw(blkvsc_req); } - kmem_cache_free(blkdev->request_pool, group); - return -ENOMEM; - } + /* + * Create new blkvsc_req to represent + * the current bvec + */ + blkvsc_req = kmem_cache_alloc(blkdev->request_pool, GFP_ATOMIC); + if (!blkvsc_req) { + /* free up everything */ + list_for_each_entry_safe( + blkvsc_req, tmp, + &group->blkvsc_req_list, + req_entry) { + list_del(&blkvsc_req->req_entry); + kmem_cache_free(blkdev->request_pool, blkvsc_req); + } + + kmem_cache_free(blkdev->request_pool, group); + return -ENOMEM; + } - memset(blkvsc_req, 0, sizeof(struct blkvsc_request)); + memset(blkvsc_req, 0, + sizeof(struct blkvsc_request)); - blkvsc_req->dev = blkdev; - blkvsc_req->req = req; - blkvsc_req->request.DataBuffer.Offset = bvec->bv_offset; - blkvsc_req->request.DataBuffer.Length = 0; + blkvsc_req->dev = blkdev; + blkvsc_req->req = req; + blkvsc_req->request.DataBuffer.Offset = bvec->bv_offset; + blkvsc_req->request.DataBuffer.Length = 0; - /* Add to the group */ - blkvsc_req->group = group; - blkvsc_req->group->outstanding++; - list_add_tail(&blkvsc_req->req_entry, &blkvsc_req->group->blkvsc_req_list); + /* Add to the group */ + blkvsc_req->group = group; + blkvsc_req->group->outstanding++; + list_add_tail(&blkvsc_req->req_entry, + &blkvsc_req->group->blkvsc_req_list); - start_sector += num_sectors; - num_sectors = 0; - databuf_idx = 0; - } + start_sector += num_sectors; + num_sectors = 0; + databuf_idx = 0; + } - /* Add the curr bvec/segment to the curr blkvsc_req */ - blkvsc_req->request.DataBuffer.PfnArray[databuf_idx] = page_to_pfn(bvec->bv_page); - blkvsc_req->request.DataBuffer.Length += bvec->bv_len; + /* Add the curr bvec/segment to the curr blkvsc_req */ + blkvsc_req->request.DataBuffer.PfnArray[databuf_idx] = page_to_pfn(bvec->bv_page); + blkvsc_req->request.DataBuffer.Length += bvec->bv_len; - prev_bvec = bvec; + prev_bvec = bvec; - databuf_idx++; - num_sectors += bvec->bv_len >> 9; + databuf_idx++; + num_sectors += bvec->bv_len >> 9; - } /* bio_for_each_segment */ + } /* bio_for_each_segment */ - } /* rq_for_each_bio */ + } /* rq_for_each_bio */ + } /* Handle the last one */ - if (blkvsc_req) - { - DPRINT_DBG(BLKVSC_DRV, "blkdev %p req %p group %p count %d\n", blkdev, req, blkvsc_req->group, blkvsc_req->group->outstanding); + if (blkvsc_req) { + DPRINT_DBG(BLKVSC_DRV, "blkdev %p req %p group %p count %d\n", + blkdev, req, blkvsc_req->group, + blkvsc_req->group->outstanding); blkvsc_req->sector_start = start_sector; - sector_div(blkvsc_req->sector_start, (blkdev->sector_size >> 9)); + sector_div(blkvsc_req->sector_start, + (blkdev->sector_size >> 9)); - blkvsc_req->sector_count = num_sectors / (blkdev->sector_size >> 9); + blkvsc_req->sector_count = num_sectors / + (blkdev->sector_size >> 9); blkvsc_init_rw(blkvsc_req); } - list_for_each_entry(blkvsc_req, &group->blkvsc_req_list, req_entry) - { - if (pending) - { - DPRINT_DBG(BLKVSC_DRV, "adding blkvsc_req to pending_list - blkvsc_req %p start_sect %lu sect_count %ld (%lu %ld)\n", - blkvsc_req, (unsigned long)blkvsc_req->sector_start, blkvsc_req->sector_count, (unsigned long) start_sector, (unsigned long) num_sectors); - - list_add_tail(&blkvsc_req->pend_entry, &blkdev->pending_list); - } - else - { - ret = blkvsc_submit_request(blkvsc_req, blkvsc_request_completion); - if (ret == -1) - { + list_for_each_entry(blkvsc_req, &group->blkvsc_req_list, req_entry) { + if (pending) { + DPRINT_DBG(BLKVSC_DRV, "adding blkvsc_req to " + "pending_list - blkvsc_req %p start_sect %lu" + " sect_count %ld (%lu %ld)\n", blkvsc_req, + (unsigned long)blkvsc_req->sector_start, + blkvsc_req->sector_count, + (unsigned long)start_sector, + (unsigned long)num_sectors); + + list_add_tail(&blkvsc_req->pend_entry, + &blkdev->pending_list); + } else { + ret = blkvsc_submit_request(blkvsc_req, + blkvsc_request_completion); + if (ret == -1) { pending = 1; - list_add_tail(&blkvsc_req->pend_entry, &blkdev->pending_list); + list_add_tail(&blkvsc_req->pend_entry, + &blkdev->pending_list); } - DPRINT_DBG(BLKVSC_DRV, "submitted blkvsc_req %p start_sect %lu sect_count %ld (%lu %ld) ret %d\n", - blkvsc_req, (unsigned long) blkvsc_req->sector_start, blkvsc_req->sector_count, (unsigned long) start_sector, num_sectors, ret); + DPRINT_DBG(BLKVSC_DRV, "submitted blkvsc_req %p " + "start_sect %lu sect_count %ld (%lu %ld) " + "ret %d\n", blkvsc_req, + (unsigned long)blkvsc_req->sector_start, + blkvsc_req->sector_count, + (unsigned long)start_sector, + num_sectors, ret); } } @@ -1106,46 +1087,47 @@ static int blkvsc_do_request(struct block_device_context *blkdev, struct request static void blkvsc_cmd_completion(struct hv_storvsc_request *request) { - struct blkvsc_request *blkvsc_req=(struct blkvsc_request*)request->Context; - struct block_device_context *blkdev = (struct block_device_context*)blkvsc_req->dev; - + struct blkvsc_request *blkvsc_req = + (struct blkvsc_request *)request->Context; + struct block_device_context *blkdev = + (struct block_device_context *)blkvsc_req->dev; struct scsi_sense_hdr sense_hdr; - DPRINT_DBG(BLKVSC_DRV, "blkvsc_cmd_completion() - req %p\n", blkvsc_req); + DPRINT_DBG(BLKVSC_DRV, "blkvsc_cmd_completion() - req %p\n", + blkvsc_req); blkdev->num_outstanding_reqs--; if (blkvsc_req->request.Status) - { - if (scsi_normalize_sense(blkvsc_req->sense_buffer, SCSI_SENSE_BUFFERSIZE, &sense_hdr)) - { + if (scsi_normalize_sense(blkvsc_req->sense_buffer, + SCSI_SENSE_BUFFERSIZE, &sense_hdr)) scsi_print_sense_hdr("blkvsc", &sense_hdr); - } - } - blkvsc_req->cond =1; + blkvsc_req->cond = 1; wake_up_interruptible(&blkvsc_req->wevent); } static void blkvsc_request_completion(struct hv_storvsc_request *request) { - struct blkvsc_request *blkvsc_req=(struct blkvsc_request*)request->Context; - struct block_device_context *blkdev = (struct block_device_context*)blkvsc_req->dev; + struct blkvsc_request *blkvsc_req = + (struct blkvsc_request *)request->Context; + struct block_device_context *blkdev = + (struct block_device_context *)blkvsc_req->dev; unsigned long flags; struct blkvsc_request *comp_req, *tmp; ASSERT(blkvsc_req->group); - DPRINT_DBG(BLKVSC_DRV, "blkdev %p blkvsc_req %p group %p type %s sect_start %lu sect_count %ld len %d group outstd %d total outstd %d\n", - blkdev, - blkvsc_req, - blkvsc_req->group, - (blkvsc_req->write)?"WRITE":"READ", - (unsigned long) blkvsc_req->sector_start, - blkvsc_req->sector_count, - blkvsc_req->request.DataBuffer.Length, - blkvsc_req->group->outstanding, - blkdev->num_outstanding_reqs); + DPRINT_DBG(BLKVSC_DRV, "blkdev %p blkvsc_req %p group %p type %s " + "sect_start %lu sect_count %ld len %d group outstd %d " + "total outstd %d\n", + blkdev, blkvsc_req, blkvsc_req->group, + (blkvsc_req->write) ? "WRITE" : "READ", + (unsigned long)blkvsc_req->sector_start, + blkvsc_req->sector_count, + blkvsc_req->request.DataBuffer.Length, + blkvsc_req->group->outstanding, + blkdev->num_outstanding_reqs); spin_lock_irqsave(&blkdev->lock, flags); @@ -1157,32 +1139,35 @@ static void blkvsc_request_completion(struct hv_storvsc_request *request) * completed. This guarantees no out-of-order blkvsc_req * completion when calling end_that_request_first() */ - if (blkvsc_req->group->outstanding == 0) - { - list_for_each_entry_safe(comp_req, tmp, &blkvsc_req->group->blkvsc_req_list, req_entry) - { - DPRINT_DBG(BLKVSC_DRV, "completing blkvsc_req %p sect_start %lu sect_count %ld \n", - comp_req, - (unsigned long) comp_req->sector_start, - comp_req->sector_count); + if (blkvsc_req->group->outstanding == 0) { + list_for_each_entry_safe(comp_req, tmp, + &blkvsc_req->group->blkvsc_req_list, + req_entry) { + DPRINT_DBG(BLKVSC_DRV, "completing blkvsc_req %p " + "sect_start %lu sect_count %ld \n", + comp_req, + (unsigned long)comp_req->sector_start, + comp_req->sector_count); list_del(&comp_req->req_entry); - if (!__blk_end_request( - comp_req->req, - (!comp_req->request.Status ? 0: -EIO), - comp_req->sector_count * blkdev->sector_size)) - { - /* All the sectors have been xferred ie the request is done */ - DPRINT_DBG(BLKVSC_DRV, "req %p COMPLETED\n", comp_req->req); - kmem_cache_free(blkdev->request_pool, comp_req->group); + if (!__blk_end_request(comp_req->req, + (!comp_req->request.Status ? 0 : -EIO), + comp_req->sector_count * blkdev->sector_size)) { + /* + * All the sectors have been xferred ie the + * request is done + */ + DPRINT_DBG(BLKVSC_DRV, "req %p COMPLETED\n", + comp_req->req); + kmem_cache_free(blkdev->request_pool, + comp_req->group); } kmem_cache_free(blkdev->request_pool, comp_req); } - if (!blkdev->shutting_down) - { + if (!blkdev->shutting_down) { blkvsc_do_pending_reqs(blkdev); blk_start_queue(blkdev->gd->queue); blkvsc_request(blkdev->gd->queue); @@ -1197,59 +1182,64 @@ static int blkvsc_cancel_pending_reqs(struct block_device_context *blkdev) struct blkvsc_request *pend_req, *tmp; struct blkvsc_request *comp_req, *tmp2; - int ret=0; + int ret = 0; DPRINT_DBG(BLKVSC_DRV, "blkvsc_cancel_pending_reqs()"); /* Flush the pending list first */ - list_for_each_entry_safe(pend_req, tmp, &blkdev->pending_list, pend_entry) - { + list_for_each_entry_safe(pend_req, tmp, &blkdev->pending_list, + pend_entry) { /* * The pend_req could be part of a partially completed * request. If so, complete those req first until we * hit the pend_req */ - list_for_each_entry_safe(comp_req, tmp2, &pend_req->group->blkvsc_req_list, req_entry) - { - DPRINT_DBG(BLKVSC_DRV, "completing blkvsc_req %p sect_start %lu sect_count %ld \n", - comp_req, - (unsigned long) comp_req->sector_start, - comp_req->sector_count); + list_for_each_entry_safe(comp_req, tmp2, + &pend_req->group->blkvsc_req_list, + req_entry) { + DPRINT_DBG(BLKVSC_DRV, "completing blkvsc_req %p " + "sect_start %lu sect_count %ld \n", + comp_req, + (unsigned long) comp_req->sector_start, + comp_req->sector_count); if (comp_req == pend_req) break; list_del(&comp_req->req_entry); - if (comp_req->req) - { - ret = __blk_end_request( - comp_req->req, - (!comp_req->request.Status ? 0 : -EIO), - comp_req->sector_count * blkdev->sector_size); - ASSERT(ret != 0); + if (comp_req->req) { + ret = __blk_end_request(comp_req->req, + (!comp_req->request.Status ? 0 : -EIO), + comp_req->sector_count * + blkdev->sector_size); + ASSERT(ret != 0); } kmem_cache_free(blkdev->request_pool, comp_req); } - DPRINT_DBG(BLKVSC_DRV, "cancelling pending request - %p\n", pend_req); + DPRINT_DBG(BLKVSC_DRV, "cancelling pending request - %p\n", + pend_req); list_del(&pend_req->pend_entry); list_del(&pend_req->req_entry); - if (comp_req->req) - { - if (!__blk_end_request( - pend_req->req, - -EIO, - pend_req->sector_count * blkdev->sector_size)) - { - /* All the sectors have been xferred ie the request is done */ - DPRINT_DBG(BLKVSC_DRV, "blkvsc_cancel_pending_reqs() - req %p COMPLETED\n", pend_req->req); - kmem_cache_free(blkdev->request_pool, pend_req->group); - } + if (comp_req->req) { + if (!__blk_end_request(pend_req->req, -EIO, + pend_req->sector_count * + blkdev->sector_size)) { + /* + * All the sectors have been xferred ie the + * request is done + */ + DPRINT_DBG(BLKVSC_DRV, + "blkvsc_cancel_pending_reqs() - " + "req %p COMPLETED\n", pend_req->req); + kmem_cache_free(blkdev->request_pool, + pend_req->group); + } } kmem_cache_free(blkdev->request_pool, pend_req); @@ -1261,22 +1251,20 @@ static int blkvsc_cancel_pending_reqs(struct block_device_context *blkdev) static int blkvsc_do_pending_reqs(struct block_device_context *blkdev) { struct blkvsc_request *pend_req, *tmp; - int ret=0; + int ret = 0; /* Flush the pending list first */ - list_for_each_entry_safe(pend_req, tmp, &blkdev->pending_list, pend_entry) - { - DPRINT_DBG(BLKVSC_DRV, "working off pending_list - %p\n", pend_req); + list_for_each_entry_safe(pend_req, tmp, &blkdev->pending_list, + pend_entry) { + DPRINT_DBG(BLKVSC_DRV, "working off pending_list - %p\n", + pend_req); - ret = blkvsc_submit_request(pend_req, blkvsc_request_completion); + ret = blkvsc_submit_request(pend_req, + blkvsc_request_completion); if (ret != 0) - { break; - } else - { list_del(&pend_req->pend_entry); - } } return ret; @@ -1286,24 +1274,24 @@ static void blkvsc_request(struct request_queue *queue) { struct block_device_context *blkdev = NULL; struct request *req; - int ret=0; + int ret = 0; DPRINT_DBG(BLKVSC_DRV, "- enter \n"); - while ((req = blk_peek_request(queue)) != NULL) - { + while ((req = blk_peek_request(queue)) != NULL) { DPRINT_DBG(BLKVSC_DRV, "- req %p\n", req); blkdev = req->rq_disk->private_data; - if (blkdev->shutting_down || !blk_fs_request(req) || blkdev->media_not_present) { + if (blkdev->shutting_down || !blk_fs_request(req) || + blkdev->media_not_present) { __blk_end_request_cur(req, 0); continue; } ret = blkvsc_do_pending_reqs(blkdev); - if (ret != 0) - { - DPRINT_DBG(BLKVSC_DRV, "- stop queue - pending_list not empty\n"); + if (ret != 0) { + DPRINT_DBG(BLKVSC_DRV, + "- stop queue - pending_list not empty\n"); blk_stop_queue(queue); break; } @@ -1311,14 +1299,11 @@ static void blkvsc_request(struct request_queue *queue) blk_start_request(req); ret = blkvsc_do_request(blkdev, req); - if (ret > 0) - { + if (ret > 0) { DPRINT_DBG(BLKVSC_DRV, "- stop queue - no room\n"); blk_stop_queue(queue); break; - } - else if (ret < 0) - { + } else if (ret < 0) { DPRINT_DBG(BLKVSC_DRV, "- stop queue - no mem\n"); blk_requeue_request(queue, req); blk_stop_queue(queue); @@ -1327,16 +1312,16 @@ static void blkvsc_request(struct request_queue *queue) } } -static int blkvsc_open(struct block_device *bdev, fmode_t mode) +static int blkvsc_open(struct block_device *bdev, fmode_t mode) { struct block_device_context *blkdev = bdev->bd_disk->private_data; - DPRINT_DBG(BLKVSC_DRV, "- users %d disk %s\n", blkdev->users, blkdev->gd->disk_name); + DPRINT_DBG(BLKVSC_DRV, "- users %d disk %s\n", blkdev->users, + blkdev->gd->disk_name); spin_lock(&blkdev->lock); - if (!blkdev->users && blkdev->device_type == DVD_TYPE) - { + if (!blkdev->users && blkdev->device_type == DVD_TYPE) { spin_unlock(&blkdev->lock); check_disk_change(bdev); spin_lock(&blkdev->lock); @@ -1352,11 +1337,11 @@ static int blkvsc_release(struct gendisk *disk, fmode_t mode) { struct block_device_context *blkdev = disk->private_data; - DPRINT_DBG(BLKVSC_DRV, "- users %d disk %s\n", blkdev->users, blkdev->gd->disk_name); + DPRINT_DBG(BLKVSC_DRV, "- users %d disk %s\n", blkdev->users, + blkdev->gd->disk_name); spin_lock(&blkdev->lock); - if (blkdev->users == 1) - { + if (blkdev->users == 1) { spin_unlock(&blkdev->lock); blkvsc_do_flush(blkdev); spin_lock(&blkdev->lock); @@ -1371,7 +1356,6 @@ static int blkvsc_release(struct gendisk *disk, fmode_t mode) static int blkvsc_media_changed(struct gendisk *gd) { DPRINT_DBG(BLKVSC_DRV, "- enter\n"); - return 1; } @@ -1381,10 +1365,10 @@ static int blkvsc_revalidate_disk(struct gendisk *gd) DPRINT_DBG(BLKVSC_DRV, "- enter\n"); - if (blkdev->device_type == DVD_TYPE) - { + if (blkdev->device_type == DVD_TYPE) { blkvsc_do_read_capacity(blkdev); - set_capacity(blkdev->gd, blkdev->capacity * (blkdev->sector_size/512)); + set_capacity(blkdev->gd, blkdev->capacity * + (blkdev->sector_size/512)); blk_queue_logical_block_size(gd->queue, blkdev->sector_size); } return 0; @@ -1393,67 +1377,79 @@ static int blkvsc_revalidate_disk(struct gendisk *gd) static int blkvsc_getgeo(struct block_device *bd, struct hd_geometry *hg) { sector_t total_sectors = get_capacity(bd->bd_disk); - sector_t cylinder_times_heads=0; - sector_t temp=0; + sector_t cylinder_times_heads = 0; + sector_t temp = 0; - int sectors_per_track=0; - int heads=0; - int cylinders=0; - int rem=0; + int sectors_per_track = 0; + int heads = 0; + int cylinders = 0; + int rem = 0; - if (total_sectors > (65535 * 16 * 255)) { - total_sectors = (65535 * 16 * 255); - } + if (total_sectors > (65535 * 16 * 255)) + total_sectors = (65535 * 16 * 255); - if (total_sectors >= (65535 * 16 * 63)) { - sectors_per_track = 255; - heads = 16; + if (total_sectors >= (65535 * 16 * 63)) { + sectors_per_track = 255; + heads = 16; cylinder_times_heads = total_sectors; - rem = sector_div(cylinder_times_heads, sectors_per_track); /* sector_div stores the quotient in cylinder_times_heads */ - } - else - { - sectors_per_track = 17; + /* sector_div stores the quotient in cylinder_times_heads */ + rem = sector_div(cylinder_times_heads, sectors_per_track); + } else { + sectors_per_track = 17; cylinder_times_heads = total_sectors; - rem = sector_div(cylinder_times_heads, sectors_per_track); /* sector_div stores the quotient in cylinder_times_heads */ + /* sector_div stores the quotient in cylinder_times_heads */ + rem = sector_div(cylinder_times_heads, sectors_per_track); temp = cylinder_times_heads + 1023; - rem = sector_div(temp, 1024); /* sector_div stores the quotient in temp */ + /* sector_div stores the quotient in temp */ + rem = sector_div(temp, 1024); heads = temp; - if (heads < 4) { - heads = 4; - } + if (heads < 4) + heads = 4; + - if (cylinder_times_heads >= (heads * 1024) || (heads > 16)) { - sectors_per_track = 31; - heads = 16; + if (cylinder_times_heads >= (heads * 1024) || (heads > 16)) { + sectors_per_track = 31; + heads = 16; cylinder_times_heads = total_sectors; - rem = sector_div(cylinder_times_heads, sectors_per_track); /* sector_div stores the quotient in cylinder_times_heads */ - } + /* + * sector_div stores the quotient in + * cylinder_times_heads + */ + rem = sector_div(cylinder_times_heads, + sectors_per_track); + } - if (cylinder_times_heads >= (heads * 1024)) { - sectors_per_track = 63; - heads = 16; + if (cylinder_times_heads >= (heads * 1024)) { + sectors_per_track = 63; + heads = 16; cylinder_times_heads = total_sectors; - rem = sector_div(cylinder_times_heads, sectors_per_track); /* sector_div stores the quotient in cylinder_times_heads */ + /* + * sector_div stores the quotient in + * cylinder_times_heads + */ + rem = sector_div(cylinder_times_heads, + sectors_per_track); + } } - } temp = cylinder_times_heads; - rem = sector_div(temp, heads); /* sector_div stores the quotient in temp */ + /* sector_div stores the quotient in temp */ + rem = sector_div(temp, heads); cylinders = temp; hg->heads = heads; - hg->sectors = sectors_per_track; - hg->cylinders = cylinders; + hg->sectors = sectors_per_track; + hg->cylinders = cylinders; - DPRINT_INFO(BLKVSC_DRV, "CHS (%d, %d, %d)", cylinders, heads, sectors_per_track); + DPRINT_INFO(BLKVSC_DRV, "CHS (%d, %d, %d)", cylinders, heads, + sectors_per_track); return 0; } @@ -1462,21 +1458,21 @@ static int blkvsc_ioctl(struct block_device *bd, fmode_t mode, unsigned cmd, unsigned long argument) { /* struct block_device_context *blkdev = bd->bd_disk->private_data; */ - int ret=0; + int ret; - switch (cmd) - { - /* TODO: I think there is certain format for HDIO_GET_IDENTITY rather than just */ - /* a GUID. Commented it out for now. */ - /*case HDIO_GET_IDENTITY: + switch (cmd) { + /* + * TODO: I think there is certain format for HDIO_GET_IDENTITY rather + * than just a GUID. Commented it out for now. + */ +#if 0 + case HDIO_GET_IDENTITY: DPRINT_INFO(BLKVSC_DRV, "HDIO_GET_IDENTITY\n"); - - if (copy_to_user((void __user *)arg, blkdev->device_id, blkdev->device_id_len)) - { + if (copy_to_user((void __user *)arg, blkdev->device_id, + blkdev->device_id_len)) ret = -EFAULT; - } - - break;*/ + break; +#endif default: ret = -EINVAL; break; @@ -1485,9 +1481,6 @@ static int blkvsc_ioctl(struct block_device *bd, fmode_t mode, return ret; } - -MODULE_LICENSE("GPL"); - static int __init blkvsc_init(void) { int ret; @@ -1508,15 +1501,11 @@ static int __init blkvsc_init(void) static void __exit blkvsc_exit(void) { DPRINT_ENTER(BLKVSC_DRV); - blkvsc_drv_exit(); - DPRINT_ENTER(BLKVSC_DRV); } +MODULE_LICENSE("GPL"); module_param(blkvsc_ringbuffer_size, int, S_IRUGO); - module_init(blkvsc_init); module_exit(blkvsc_exit); - -/* eof */ -- 2.7.4