Merge branch 'linus' into core/rcu

1 files changed, 26 insertions, 4 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index c3df30cfb3fc..c36aa98fafa3 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -592,7 +592,7 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)
                                    1 << QUEUE_FLAG_STACKABLE);
         q->queue_lock           = lock;
 
-        blk_queue_segment_boundary(q, 0xffffffff);
+        blk_queue_segment_boundary(q, BLK_SEG_BOUNDARY_MASK);
 
         blk_queue_make_request(q, __make_request);
         blk_queue_max_segment_size(q, MAX_SEGMENT_SIZE);
@@ -1637,6 +1637,28 @@ int blk_insert_cloned_request(struct request_queue *q, struct request *rq)
 EXPORT_SYMBOL_GPL(blk_insert_cloned_request);
 
 /**
+ * blkdev_dequeue_request - dequeue request and start timeout timer
+ * @req: request to dequeue
+ *
+ * Dequeue @req and start timeout timer on it.  This hands off the
+ * request to the driver.
+ *
+ * Block internal functions which don't want to start timer should
+ * call elv_dequeue_request().
+ */
+void blkdev_dequeue_request(struct request *req)
+{
+        elv_dequeue_request(req->q, req);
+
+        /*
+         * We are now handing the request to the hardware, add the
+         * timeout handler.
+         */
+        blk_add_timer(req);
+}
+EXPORT_SYMBOL(blkdev_dequeue_request);
+
+/**
  * __end_that_request_first - end I/O on a request
  * @req:      the request being processed
  * @error:    %0 for success, < %0 for error
@@ -1770,17 +1792,17 @@ 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);
 
         if (blk_queued_rq(req))
-                blkdev_dequeue_request(req);
+                elv_dequeue_request(req->q, req);
 
         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