block: replace end_request() with [__]blk_end_request_cur()

end_request() has been kept around for backward compatibility;
however, it's about time for it to go away.

* There aren't too many users left.

* Its use of @updtodate is pretty confusing.

* In some cases, newer code ends up using mixture of end_request() and
  [__]blk_end_request[_all](), which is way too confusing.

So, add [__]blk_end_request_cur() and replace end_request() with it.
Most conversions are straightforward.  Noteworthy ones are...

* paride/pcd: next_request() updated to take 0/-errno instead of 1/0.

* paride/pf: pf_end_request() and next_request() updated to take
  0/-errno instead of 1/0.

* xd: xd_readwrite() updated to return 0/-errno instead of 1/0.

* mtd/mtd_blkdevs: blktrans_discard_request() updated to return
  0/-errno instead of 1/0.  Unnecessary local variable res
  initialization removed from mtd_blktrans_thread().

[ Impact: cleanup ]

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Joerg Dorchain <joerg@dorchain.net>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Laurent Vivier <Laurent@lvivier.info>
Cc: Tim Waugh <tim@cyberelk.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Pete Zaitcev <zaitcev@redhat.com>
Cc: unsik Kim <donari75@gmail.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/block/hd.c b/drivers/block/hd.c
index baaa9e486e50..5cb300b81c6a 100644
--- a/drivers/block/hd.c
+++ b/drivers/block/hd.c
@@ -410,7 +410,7 @@ static void bad_rw_intr(void)
         if (req != NULL) {
                 struct hd_i_struct *disk = req->rq_disk->private_data;
                 if (++req->errors >= MAX_ERRORS || (hd_error & BBD_ERR)) {
-                        end_request(req, 0);
+                        __blk_end_request_cur(req, -EIO);
                         disk->special_op = disk->recalibrate = 1;
                 } else if (req->errors % RESET_FREQ == 0)
                         reset = 1;
@@ -466,7 +466,7 @@ ok_to_read:
                 req->buffer+512);
 #endif
         if (req->current_nr_sectors <= 0)
-                end_request(req, 1);
+                __blk_end_request_cur(req, 0);
         if (i > 0) {
                 SET_HANDLER(&read_intr);
                 return;
@@ -505,7 +505,7 @@ ok_to_write:
         --req->current_nr_sectors;
         req->buffer += 512;
         if (!i || (req->bio && req->current_nr_sectors <= 0))
-                end_request(req, 1);
+                __blk_end_request_cur(req, 0);
         if (i > 0) {
                 SET_HANDLER(&write_intr);
                 outsw(HD_DATA, req->buffer, 256);
@@ -548,7 +548,7 @@ static void hd_times_out(unsigned long dummy)
 #ifdef DEBUG
                 printk("%s: too many errors\n", name);
 #endif
-                end_request(CURRENT, 0);
+                __blk_end_request_cur(CURRENT, -EIO);
         }
         hd_request();
         spin_unlock_irq(hd_queue->queue_lock);
@@ -563,7 +563,7 @@ static int do_special_op(struct hd_i_struct *disk, struct request *req)
         }
         if (disk->head > 16) {
                 printk("%s: cannot handle device with more than 16 heads - giving up\n", req->rq_disk->disk_name);
-                end_request(req, 0);
+                __blk_end_request_cur(req, -EIO);
         }
         disk->special_op = 0;
         return 1;
@@ -607,7 +607,7 @@ repeat:
             ((block+nsect) > get_capacity(req->rq_disk))) {
                 printk("%s: bad access: block=%d, count=%d\n",
                         req->rq_disk->disk_name, block, nsect);
-                end_request(req, 0);
+                __blk_end_request_cur(req, -EIO);
                 goto repeat;
         }
 
@@ -647,7 +647,7 @@ repeat:
                         break;
                 default:
                         printk("unknown hd-command\n");
-                        end_request(req, 0);
+                        __blk_end_request_cur(req, -EIO);
                         break;
                 }
         }