3 files changed, 9 insertions, 9 deletions

diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c
index f6586e4d351c..c2388673684e 100644
--- a/drivers/block/ps3disk.c
+++ b/drivers/block/ps3disk.c
@@ -136,7 +136,7 @@ static int ps3disk_submit_request_sg(struct ps3_storage_device *dev,
         dev_dbg(&dev->sbd.core,
                 "%s:%u: %s req has %u bvecs for %lu sectors %lu hard sectors\n",
                 __func__, __LINE__, op, n, req->nr_sectors,
-                req->hard_nr_sectors);
+                blk_rq_sectors(req));
 #endif
 
         start_sector = req->sector * priv->blocking_factor;
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)
                 blkdev_dequeue_request(req);
                 /* check that request contains a valid command */
                 if (!blk_fs_request(req)) {
-                        viodasd_end_request(req, -EIO, req->hard_nr_sectors);
+                        viodasd_end_request(req, -EIO, blk_rq_sectors(req));
                         continue;
                 }
                 /* Try sending the request */
                 if (send_request(req) != 0)
-                        viodasd_end_request(req, -EIO, req->hard_nr_sectors);
+                        viodasd_end_request(req, -EIO, blk_rq_sectors(req));
         }
 }
 
@@ -590,7 +590,7 @@ static int viodasd_handle_read_write(struct vioblocklpevent *bevent)
                 err = vio_lookup_rc(viodasd_err_table, bevent->sub_result);
                 printk(VIOD_KERN_WARNING "read/write error %d:0x%04x (%s)\n",
                                 event->xRc, bevent->sub_result, err->msg);
-                num_sect = req->hard_nr_sectors;
+                num_sect = blk_rq_sectors(req);
         }
         qlock = req->q->queue_lock;
         spin_lock_irqsave(qlock, irq_flags);
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index b1e1d7e5ab1e..5722931d14c5 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -645,8 +645,8 @@ static void ace_fsm_dostate(struct ace_device *ace)
 
                 /* Okay, it's a data request, set it up for transfer */
                 dev_dbg(ace->dev,
-                        "request: sec=%llx hcnt=%lx, ccnt=%x, dir=%i\n",
-                        (unsigned long long) req->sector, req->hard_nr_sectors,
+                        "request: sec=%llx hcnt=%x, ccnt=%x, dir=%i\n",
+                        (unsigned long long) req->sector, blk_rq_sectors(req),
                         req->current_nr_sectors, rq_data_dir(req));
 
                 ace->req = req;
@@ -654,7 +654,7 @@ static void ace_fsm_dostate(struct ace_device *ace)
                 ace->data_count = req->current_nr_sectors * ACE_BUF_PER_SECTOR;
                 ace_out32(ace, ACE_MPULBA, req->sector & 0x0FFFFFFF);
 
-                count = req->hard_nr_sectors;
+                count = blk_rq_sectors(req);
                 if (rq_data_dir(req)) {
                         /* Kick off write request */
                         dev_dbg(ace->dev, "write data\n");
@@ -719,8 +719,8 @@ static void ace_fsm_dostate(struct ace_device *ace)
                 /* bio finished; is there another one? */
                 if (__blk_end_request(ace->req, 0,
                                         blk_rq_cur_bytes(ace->req))) {
-                        /* dev_dbg(ace->dev, "next block; h=%li c=%i\n",
-                         *      ace->req->hard_nr_sectors,
+                        /* dev_dbg(ace->dev, "next block; h=%u c=%u\n",
+                         *      blk_rq_sectors(ace->req),
                          *      ace->req->current_nr_sectors);
                          */
                         ace->data_ptr = ace->req->buffer;