block: convert to pos and nr_sectors accessors

With recent cleanups, there is no place where low level driver
directly manipulates request fields.  This means that the 'hard'
request fields always equal the !hard fields.  Convert all
rq->sectors, nr_sectors and current_nr_sectors references to
accessors.

While at it, drop superflous blk_rq_pos() < 0 test in swim.c.

[ Impact: use pos and nr_sectors accessors ]

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Tested-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Tested-by: Adrian McMenamin <adrian@mcmen.demon.co.uk>
Acked-by: Adrian McMenamin <adrian@mcmen.demon.co.uk>
Acked-by: Mike Miller <mike.miller@hp.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Borislav Petkov <petkovbb@googlemail.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Eric Moore <Eric.Moore@lsi.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Pete Zaitcev <zaitcev@redhat.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Clements <paul.clements@steeleye.com>
Cc: Tim Waugh <tim@cyberelk.net>
Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Alex Dubov <oakad@yahoo.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Dario Ballabio <ballabio_dario@emc.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: unsik Kim <donari75@gmail.com>
Cc: Laurent Vivier <Laurent@lvivier.info>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 18 insertions, 16 deletions

diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 424855945b9b..c1b9a4dc11ba 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -312,14 +312,14 @@ static void start_request(struct floppy_state *fs)
         }
         while (fs->state == idle && (req = elv_next_request(swim3_queue))) {
 #if 0
-                printk("do_fd_req: dev=%s cmd=%d sec=%ld nr_sec=%ld buf=%p\n",
+                printk("do_fd_req: dev=%s cmd=%d sec=%ld nr_sec=%u buf=%p\n",
                        req->rq_disk->disk_name, req->cmd,
-                       (long)req->sector, req->nr_sectors, req->buffer);
-                printk("           errors=%d current_nr_sectors=%ld\n",
-                       req->errors, req->current_nr_sectors);
+                       (long)blk_rq_pos(req), blk_rq_sectors(req), req->buffer);
+                printk("           errors=%d current_nr_sectors=%u\n",
+                       req->errors, blk_rq_cur_sectors(req));
 #endif
 
-                if (req->sector >= fs->total_secs) {
+                if (blk_rq_pos(req) >= fs->total_secs) {
                         __blk_end_request_cur(req, -EIO);
                         continue;
                 }
@@ -337,13 +337,14 @@ static void start_request(struct floppy_state *fs)
                         }
                 }
 
-                /* Do not remove the cast. req->sector is now a sector_t and
-                 * can be 64 bits, but it will never go past 32 bits for this
-                 * driver anyway, so we can safely cast it down and not have
-                 * to do a 64/32 division
+                /* Do not remove the cast. blk_rq_pos(req) is now a
+                 * sector_t and can be 64 bits, but it will never go
+                 * past 32 bits for this driver anyway, so we can
+                 * safely cast it down and not have to do a 64/32
+                 * division
                  */
-                fs->req_cyl = ((long)req->sector) / fs->secpercyl;
-                x = ((long)req->sector) % fs->secpercyl;
+                fs->req_cyl = ((long)blk_rq_pos(req)) / fs->secpercyl;
+                x = ((long)blk_rq_pos(req)) % fs->secpercyl;
                 fs->head = x / fs->secpertrack;
                 fs->req_sector = x % fs->secpertrack + 1;
                 fd_req = req;
@@ -420,7 +421,7 @@ static inline void setup_transfer(struct floppy_state *fs)
         struct dbdma_cmd *cp = fs->dma_cmd;
         struct dbdma_regs __iomem *dr = fs->dma;
 
-        if (fd_req->current_nr_sectors <= 0) {
+        if (blk_rq_cur_sectors(fd_req) <= 0) {
                 printk(KERN_ERR "swim3: transfer 0 sectors?\n");
                 return;
         }
@@ -428,8 +429,8 @@ static inline void setup_transfer(struct floppy_state *fs)
                 n = 1;
         else {
                 n = fs->secpertrack - fs->req_sector + 1;
-                if (n > fd_req->current_nr_sectors)
-                        n = fd_req->current_nr_sectors;
+                if (n > blk_rq_cur_sectors(fd_req))
+                        n = blk_rq_cur_sectors(fd_req);
         }
         fs->scount = n;
         swim3_select(fs, fs->head? READ_DATA_1: READ_DATA_0);
@@ -600,7 +601,8 @@ static void xfer_timeout(unsigned long data)
         out_8(&sw->control_bic, WRITE_SECTORS | DO_ACTION);
         out_8(&sw->select, RELAX);
         printk(KERN_ERR "swim3: timeout %sing sector %ld\n",
-               (rq_data_dir(fd_req)==WRITE? "writ": "read"), (long)fd_req->sector);
+               (rq_data_dir(fd_req)==WRITE? "writ": "read"),
+               (long)blk_rq_pos(fd_req));
         __blk_end_request_cur(fd_req, -EIO);
         fs->state = idle;
         start_request(fs);
@@ -714,7 +716,7 @@ static irqreturn_t swim3_interrupt(int irq, void *dev_id)
                         } else {
                                 printk("swim3: error %sing block %ld (err=%x)\n",
                                        rq_data_dir(fd_req) == WRITE? "writ": "read",
-                                       (long)fd_req->sector, err);
+                                       (long)blk_rq_pos(fd_req), err);
                                 __blk_end_request_cur(fd_req, -EIO);
                                 fs->state = idle;
                         }