aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/viodasd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/viodasd.c')
-rw-r--r--drivers/block/viodasd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index ecccf65dce2f..e821eed7132f 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -368,12 +368,12 @@ static void do_viodasd_request(struct request_queue *q)
368 blkdev_dequeue_request(req); 368 blkdev_dequeue_request(req);
369 /* check that request contains a valid command */ 369 /* check that request contains a valid command */
370 if (!blk_fs_request(req)) { 370 if (!blk_fs_request(req)) {
371 viodasd_end_request(req, -EIO, req->hard_nr_sectors); 371 viodasd_end_request(req, -EIO, blk_rq_sectors(req));
372 continue; 372 continue;
373 } 373 }
374 /* Try sending the request */ 374 /* Try sending the request */
375 if (send_request(req) != 0) 375 if (send_request(req) != 0)
376 viodasd_end_request(req, -EIO, req->hard_nr_sectors); 376 viodasd_end_request(req, -EIO, blk_rq_sectors(req));
377 } 377 }
378} 378}
379 379
@@ -590,7 +590,7 @@ static int viodasd_handle_read_write(struct vioblocklpevent *bevent)
590 err = vio_lookup_rc(viodasd_err_table, bevent->sub_result); 590 err = vio_lookup_rc(viodasd_err_table, bevent->sub_result);
591 printk(VIOD_KERN_WARNING "read/write error %d:0x%04x (%s)\n", 591 printk(VIOD_KERN_WARNING "read/write error %d:0x%04x (%s)\n",
592 event->xRc, bevent->sub_result, err->msg); 592 event->xRc, bevent->sub_result, err->msg);
593 num_sect = req->hard_nr_sectors; 593 num_sect = blk_rq_sectors(req);
594 } 594 }
595 qlock = req->q->queue_lock; 595 qlock = req->q->queue_lock;
596 spin_lock_irqsave(qlock, irq_flags); 596 spin_lock_irqsave(qlock, irq_flags);