7 files changed, 22 insertions, 50 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index c3df30cfb3fc..10e8a64a5a5b 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1770,8 +1770,6 @@ static void end_that_request_last(struct request *req, int error)
 {
         struct gendisk *disk = req->rq_disk;
 
-        blk_delete_timer(req);
-
         if (blk_rq_tagged(req))
                 blk_queue_end_tag(req->q, req);
 
@@ -1781,6 +1779,8 @@ static void end_that_request_last(struct request *req, int error)
         if (unlikely(laptop_mode) && blk_fs_request(req))
                 laptop_io_completion();
 
+        blk_delete_timer(req);
+
         /*
          * Account IO completion.  bar_rq isn't accounted as a normal
          * IO on queueing nor completion.  Accounting the containing
diff --git a/block/blk-map.c b/block/blk-map.c
index 4849fa36161e..0f4b4b881811 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -217,6 +217,12 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
                 return PTR_ERR(bio);
 
         if (bio->bi_size != len) {
+                /*
+                 * Grab an extra reference to this bio, as bio_unmap_user()
+                 * expects to be able to drop it twice as it happens on the
+                 * normal IO completion path
+                 */
+                bio_get(bio);
                 bio_endio(bio, 0);
                 bio_unmap_user(bio);
                 return -EINVAL;
diff --git a/block/blk-merge.c b/block/blk-merge.c
index 8681cd6f9911..b92f5b0866b0 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -222,27 +222,6 @@ new_segment:
 }
 EXPORT_SYMBOL(blk_rq_map_sg);
 
-static inline int ll_new_mergeable(struct request_queue *q,
-                                   struct request *req,
-                                   struct bio *bio)
-{
-        int nr_phys_segs = bio_phys_segments(q, bio);
-
-        if (req->nr_phys_segments + nr_phys_segs > q->max_phys_segments) {
-                req->cmd_flags |= REQ_NOMERGE;
-                if (req == q->last_merge)
-                        q->last_merge = NULL;
-                return 0;
-        }
-
-        /*
-         * A hw segment is just getting larger, bump just the phys
-         * counter.
-         */
-        req->nr_phys_segments += nr_phys_segs;
-        return 1;
-}
-
 static inline int ll_new_hw_segment(struct request_queue *q,
                                     struct request *req,
                                     struct bio *bio)
diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 972a63f848fb..69185ea9fae2 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -75,14 +75,7 @@ void blk_delete_timer(struct request *req)
 {
         struct request_queue *q = req->q;
 
-        /*
-         * Nothing to detach
-         */
-        if (!q->rq_timed_out_fn || !req->deadline)
-                return;
-
         list_del_init(&req->timeout_list);
-
         if (list_empty(&q->timeout_list))
                 del_timer(&q->timeout);
 }
@@ -142,7 +135,7 @@ void blk_rq_timed_out_timer(unsigned long data)
         }
 
         if (next_set && !list_empty(&q->timeout_list))
-                mod_timer(&q->timeout, round_jiffies(next));
+                mod_timer(&q->timeout, round_jiffies_up(next));
 
         spin_unlock_irqrestore(q->queue_lock, flags);
 }
@@ -198,17 +191,10 @@ void blk_add_timer(struct request *req)
 
         /*
          * If the timer isn't already pending or this timeout is earlier
-         * than an existing one, modify the timer. Round to next nearest
+         * than an existing one, modify the timer. Round up to next nearest
          * second.
          */
-        expiry = round_jiffies(req->deadline);
-
-        /*
-         * We use ->deadline == 0 to detect whether a timer was added or
-         * not, so just increase to next jiffy for that specific case
-         */
-        if (unlikely(!req->deadline))
-                req->deadline = 1;
+        expiry = round_jiffies_up(req->deadline);
 
         if (!timer_pending(&q->timeout) ||
             time_before(expiry, q->timeout.expires))
diff --git a/block/elevator.c b/block/elevator.c
index 59173a69ebdf..9ac82dde99dd 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -773,12 +773,6 @@ struct request *elv_next_request(struct request_queue *q)
                          */
                         rq->cmd_flags |= REQ_STARTED;
                         blk_add_trace_rq(q, rq, BLK_TA_ISSUE);
-
-                        /*
-                         * We are now handing the request to the hardware,
-                         * add the timeout handler
-                         */
-                        blk_add_timer(rq);
                 }
 
                 if (!q->boundary_rq || q->boundary_rq == rq) {
@@ -850,6 +844,12 @@ void elv_dequeue_request(struct request_queue *q, struct request *rq)
          */
         if (blk_account_rq(rq))
                 q->in_flight++;
+
+        /*
+         * We are now handing the request to the hardware, add the
+         * timeout handler.
+         */
+        blk_add_timer(rq);
 }
 EXPORT_SYMBOL(elv_dequeue_request);
 
diff --git a/block/genhd.c b/block/genhd.c
index 4e5e7493f676..27549e470da5 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -768,6 +768,8 @@ static int __init genhd_device_init(void)
         bdev_map = kobj_map_init(base_probe, &block_class_lock);
         blk_dev_init();
 
+        register_blkdev(BLOCK_EXT_MAJOR, "blkext");
+
 #ifndef CONFIG_SYSFS_DEPRECATED
         /* create top-level block dir */
         block_depr = kobject_create_and_add("block", NULL);
diff --git a/block/ioctl.c b/block/ioctl.c
index c832d639b6e2..d03985b04d67 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -18,7 +18,6 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user
         struct disk_part_iter piter;
         long long start, length;
         int partno;
-        int err;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EACCES;
@@ -61,10 +60,10 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user
                         disk_part_iter_exit(&piter);
 
                         /* all seems OK */
-                        err = add_partition(disk, partno, start, length,
-                                            ADDPART_FLAG_NONE);
+                        part = add_partition(disk, partno, start, length,
+                                             ADDPART_FLAG_NONE);
                         mutex_unlock(&bdev->bd_mutex);
-                        return err;
+                        return IS_ERR(part) ? PTR_ERR(part) : 0;
                 case BLKPG_DEL_PARTITION:
                         part = disk_get_part(disk, partno);
                         if (!part)