Staging: hv: Get rid of the forward declaration of blkvsc_do_read_capacity16()

Get rid of the forward declaration of blkvsc_do_read_capacity16() by moving
the code around.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 21be2ab..900ffc1 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -769,6 +769,90 @@ 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;
+       struct page *page_buf;
+       unsigned char *buf;
+       struct scsi_sense_hdr sense_hdr;
+       struct vmscsi_request *vm_srb;
+
+       DPRINT_DBG(BLKVSC_DRV, "blkvsc_do_read_capacity16()\n");
+
+       blkdev->sector_size = 0;
+       blkdev->capacity = 0;
+       blkdev->media_not_present = 0; /* assume a disk is present */
+
+       blkvsc_req = kmem_cache_zalloc(blkdev->request_pool, GFP_KERNEL);
+       if (!blkvsc_req)
+               return -ENOMEM;
+
+       memset(blkvsc_req, 0, sizeof(struct blkvsc_request));
+       vm_srb = &blkvsc_req->request.vstor_packet.vm_srb;
+       page_buf = alloc_page(GFP_KERNEL);
+       if (!page_buf) {
+               kmem_cache_free(blkvsc_req->dev->request_pool, blkvsc_req);
+               return -ENOMEM;
+       }
+
+       init_completion(&blkvsc_req->request.wait_event);
+       blkvsc_req->dev = blkdev;
+       blkvsc_req->req = NULL;
+       blkvsc_req->write = 0;
+
+       blkvsc_req->request.data_buffer.pfn_array[0] =
+       page_to_pfn(page_buf);
+       blkvsc_req->request.data_buffer.offset = 0;
+       blkvsc_req->request.data_buffer.len = 12;
+
+       blkvsc_req->cmnd[0] = 0x9E; /* READ_CAPACITY16; */
+       blkvsc_req->cmd_len = 16;
+
+       /*
+        * Set this here since the completion routine may be invoked
+        * and completed before we return
+        */
+
+       blkvsc_submit_request(blkvsc_req, blkvsc_cmd_completion);
+
+       DPRINT_DBG(BLKVSC_DRV, "waiting %p to complete\n",
+                  blkvsc_req);
+
+       wait_for_completion_interruptible(&blkvsc_req->request.wait_event);
+
+       /* check error */
+       if (vm_srb->scsi_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]);
+
+#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);
+
+       __free_page(page_buf);
+
+       kmem_cache_free(blkvsc_req->dev->request_pool, blkvsc_req);
+
+       return 0;
+}
+
 /* Static decl */
 static int blkvsc_probe(struct device *dev);
 static int blkvsc_revalidate_disk(struct gendisk *gd);
@@ -777,7 +861,6 @@ 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_do_inquiry(struct block_device_context *blkdev);
-static int blkvsc_do_read_capacity16(struct block_device_context *blkdev);
 static int blkvsc_do_pending_reqs(struct block_device_context *blkdev);
 
 static int blkvsc_ringbuffer_size = BLKVSC_RING_BUFFER_SIZE;
@@ -1110,89 +1193,6 @@ static int blkvsc_do_inquiry(struct block_device_context *blkdev)
        return 0;
 }
 
-static int blkvsc_do_read_capacity16(struct block_device_context *blkdev)
-{
-       struct blkvsc_request *blkvsc_req;
-       struct page *page_buf;
-       unsigned char *buf;
-       struct scsi_sense_hdr sense_hdr;
-       struct vmscsi_request *vm_srb;
-
-       DPRINT_DBG(BLKVSC_DRV, "blkvsc_do_read_capacity16()\n");
-
-       blkdev->sector_size = 0;
-       blkdev->capacity = 0;
-       blkdev->media_not_present = 0; /* assume a disk is present */
-
-       blkvsc_req = kmem_cache_zalloc(blkdev->request_pool, GFP_KERNEL);
-       if (!blkvsc_req)
-               return -ENOMEM;
-
-       memset(blkvsc_req, 0, sizeof(struct blkvsc_request));
-       vm_srb = &blkvsc_req->request.vstor_packet.vm_srb;
-       page_buf = alloc_page(GFP_KERNEL);
-       if (!page_buf) {
-               kmem_cache_free(blkvsc_req->dev->request_pool, blkvsc_req);
-               return -ENOMEM;
-       }
-
-       init_completion(&blkvsc_req->request.wait_event);
-       blkvsc_req->dev = blkdev;
-       blkvsc_req->req = NULL;
-       blkvsc_req->write = 0;
-
-       blkvsc_req->request.data_buffer.pfn_array[0] =
-       page_to_pfn(page_buf);
-       blkvsc_req->request.data_buffer.offset = 0;
-       blkvsc_req->request.data_buffer.len = 12;
-
-       blkvsc_req->cmnd[0] = 0x9E; /* READ_CAPACITY16; */
-       blkvsc_req->cmd_len = 16;
-
-       /*
-        * Set this here since the completion routine may be invoked
-        * and completed before we return
-        */
-
-       blkvsc_submit_request(blkvsc_req, blkvsc_cmd_completion);
-
-       DPRINT_DBG(BLKVSC_DRV, "waiting %p to complete\n",
-                  blkvsc_req);
-
-       wait_for_completion_interruptible(&blkvsc_req->request.wait_event);
-
-       /* check error */
-       if (vm_srb->scsi_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]);
-
-#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);
-
-       __free_page(page_buf);
-
-       kmem_cache_free(blkvsc_req->dev->request_pool, blkvsc_req);
-
-       return 0;
-}
-
 /*
  * We break the request into 1 or more blkvsc_requests and submit
  * them.  If we can't submit them all, we put them on the