Staging: hv: Get rid of the state media_not_present

The block driver in Hyper-V does not handle removable media, get rid of the
media_not_present state.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@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 a7ae4371d1689d75e606286184be65c035a0f15b..4c248b7c9db3012251ca6c24be02349bf70fa314 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -103,7 +103,6 @@ struct block_device_context {
        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;
@@ -446,7 +445,6 @@ static int blkvsc_do_operation(struct block_device_context *blkdev,
        case DO_CAPACITY:
                blkdev->sector_size = 0;
                blkdev->capacity = 0;
-               blkdev->media_not_present = 0; /* assume a disk is present */
 
                blkvsc_req->cmnd[0] = READ_CAPACITY;
                blkvsc_req->cmd_len = 16;
@@ -473,10 +471,6 @@ static int blkvsc_do_operation(struct block_device_context *blkdev,
                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;
        }
 
@@ -964,8 +958,7 @@ static void blkvsc_request(struct request_queue *queue)
                DPRINT_DBG(BLKVSC_DRV, "- req %p\n", req);
 
                blkdev = req->rq_disk->private_data;
-               if (blkdev->shutting_down || req->cmd_type != REQ_TYPE_FS ||
-                   blkdev->media_not_present) {
+               if (blkdev->shutting_down || req->cmd_type != REQ_TYPE_FS) {
                        __blk_end_request_cur(req, 0);
                        continue;
                }