3 files changed, 10 insertions, 10 deletions

diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index 9fd57c2aa463..2d5dc0af55e4 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -728,8 +728,8 @@ static void do_pcd_request(struct request_queue * q)
                         if (cd != pcd_current)
                                 pcd_bufblk = -1;
                         pcd_current = cd;
-                        pcd_sector = pcd_req->sector;
-                        pcd_count = pcd_req->current_nr_sectors;
+                        pcd_sector = blk_rq_pos(pcd_req);
+                        pcd_count = blk_rq_cur_sectors(pcd_req);
                         pcd_buf = pcd_req->buffer;
                         pcd_busy = 1;
                         ps_set_intr(do_pcd_read, NULL, 0, nice);
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 0732df4e901a..9ec5d4ac0b64 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -444,11 +444,11 @@ static enum action do_pd_io_start(void)
 
         pd_cmd = rq_data_dir(pd_req);
         if (pd_cmd == READ || pd_cmd == WRITE) {
-                pd_block = pd_req->sector;
-                pd_count = pd_req->current_nr_sectors;
+                pd_block = blk_rq_pos(pd_req);
+                pd_count = blk_rq_cur_sectors(pd_req);
                 if (pd_block + pd_count > get_capacity(pd_req->rq_disk))
                         return Fail;
-                pd_run = pd_req->nr_sectors;
+                pd_run = blk_rq_sectors(pd_req);
                 pd_buf = pd_req->buffer;
                 pd_retries = 0;
                 if (pd_cmd == READ)
@@ -479,7 +479,7 @@ static int pd_next_buf(void)
                 return 0;
         spin_lock_irqsave(&pd_lock, saved_flags);
         __blk_end_request_cur(pd_req, 0);
-        pd_count = pd_req->current_nr_sectors;
+        pd_count = blk_rq_cur_sectors(pd_req);
         pd_buf = pd_req->buffer;
         spin_unlock_irqrestore(&pd_lock, saved_flags);
         return 0;
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 3871e3586d6d..e88c889aa7f2 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -768,9 +768,9 @@ repeat:
                 return;
 
         pf_current = pf_req->rq_disk->private_data;
-        pf_block = pf_req->sector;
-        pf_run = pf_req->nr_sectors;
-        pf_count = pf_req->current_nr_sectors;
+        pf_block = blk_rq_pos(pf_req);
+        pf_run = blk_rq_sectors(pf_req);
+        pf_count = blk_rq_cur_sectors(pf_req);
 
         if (pf_block + pf_count > get_capacity(pf_req->rq_disk)) {
                 pf_end_request(-EIO);
@@ -810,7 +810,7 @@ static int pf_next_buf(void)
                 spin_unlock_irqrestore(&pf_spin_lock, saved_flags);
                 if (!pf_req)
                         return 1;
-                pf_count = pf_req->current_nr_sectors;
+                pf_count = blk_rq_cur_sectors(pf_req);
                 pf_buf = pf_req->buffer;
         }
         return 0;