3 files changed, 4 insertions, 21 deletions

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 7c9ca01baa45..b0de8574fdc8 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -380,12 +380,6 @@ static int attempt_merge(struct request_queue *q, struct request *req,
         if (blk_integrity_rq(req) != blk_integrity_rq(next))
                 return 0;
 
-        /* don't merge requests of different failfast settings */
-        if (blk_failfast_dev(req)       != blk_failfast_dev(next)       ||
-            blk_failfast_transport(req) != blk_failfast_transport(next) ||
-            blk_failfast_driver(req)    != blk_failfast_driver(next))
-                return 0;
-
         /*
          * If we are allowed to merge, then append bio list
          * from next to rq and release next. merge_requests_fn
diff --git a/block/elevator.c b/block/elevator.c
index 2d511f9105e1..ca861927ba41 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -100,19 +100,6 @@ int elv_rq_merge_ok(struct request *rq, struct bio *bio)
         if (bio_integrity(bio) != blk_integrity_rq(rq))
                 return 0;
 
-        /*
-         * Don't merge if failfast settings don't match.
-         *
-         * FIXME: The negation in front of each condition is necessary
-         * because bio and request flags use different bit positions
-         * and the accessors return those bits directly.  This
-         * ugliness will soon go away.
-         */
-        if (!bio_failfast_dev(bio)       != !blk_failfast_dev(rq)       ||
-            !bio_failfast_transport(bio) != !blk_failfast_transport(rq) ||
-            !bio_failfast_driver(bio)    != !blk_failfast_driver(rq))
-                return 0;
-
         if (!elv_iosched_allow_merge(rq, bio))
                 return 0;
 
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index f3c40898fc7d..90c94da8baa4 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -897,8 +897,10 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
                         if (driver_byte(result) & DRIVER_SENSE)
                                 scsi_print_sense("", cmd);
                 }
-                blk_end_request_all(req, -EIO);
-                scsi_next_command(cmd);
+                if (blk_end_request_err(req, -EIO))
+                        scsi_requeue_command(q, cmd);
+                else
+                        scsi_next_command(cmd);
                 break;
         case ACTION_REPREP:
                 /* Unprep the request and put it back at the head of the queue.