2 files changed, 27 insertions, 15 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 525693237a4a..59b5c00c0126 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2046,9 +2046,26 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)
 
         if (error && req->cmd_type == REQ_TYPE_FS &&
             !(req->cmd_flags & REQ_QUIET)) {
-                printk(KERN_ERR "end_request: I/O error, dev %s, sector %llu\n",
-                                req->rq_disk ? req->rq_disk->disk_name : "?",
-                                (unsigned long long)blk_rq_pos(req));
+                char *error_type;
+
+                switch (error) {
+                case -ENOLINK:
+                        error_type = "recoverable transport";
+                        break;
+                case -EREMOTEIO:
+                        error_type = "critical target";
+                        break;
+                case -EBADE:
+                        error_type = "critical nexus";
+                        break;
+                case -EIO:
+                default:
+                        error_type = "I/O";
+                        break;
+                }
+                printk(KERN_ERR "end_request: %s error, dev %s, sector %llu\n",
+                       error_type, req->rq_disk ? req->rq_disk->disk_name : "?",
+                       (unsigned long long)blk_rq_pos(req));
         }
 
         blk_account_io_completion(req, nr_bytes);
diff --git a/block/blk-lib.c b/block/blk-lib.c
index cb56c4e5b494..25de73e4759b 100644
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -109,7 +109,6 @@ struct bio_batch
         atomic_t                done;
         unsigned long           flags;
         struct completion       *wait;
-        bio_end_io_t            *end_io;
 };
 
 static void bio_batch_end_io(struct bio *bio, int err)
@@ -122,12 +121,9 @@ static void bio_batch_end_io(struct bio *bio, int err)
                 else
                         clear_bit(BIO_UPTODATE, &bb->flags);
         }
-        if (bb) {
-                if (bb->end_io)
-                        bb->end_io(bio, err);
-                atomic_inc(&bb->done);
-                complete(bb->wait);
-        }
+        if (bb)
+                if (atomic_dec_and_test(&bb->done))
+                        complete(bb->wait);
         bio_put(bio);
 }
 
@@ -148,13 +144,12 @@ int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
         int ret;
         struct bio *bio;
         struct bio_batch bb;
-        unsigned int sz, issued = 0;
+        unsigned int sz;
         DECLARE_COMPLETION_ONSTACK(wait);
 
-        atomic_set(&bb.done, 0);
+        atomic_set(&bb.done, 1);
         bb.flags = 1 << BIO_UPTODATE;
         bb.wait = &wait;
-        bb.end_io = NULL;
 
 submit:
         ret = 0;
@@ -183,12 +178,12 @@ submit:
                                 break;
                 }
                 ret = 0;
-                issued++;
+                atomic_inc(&bb.done);
                 submit_bio(WRITE, bio);
         }
 
         /* Wait for bios in-flight */
-        while (issued != atomic_read(&bb.done))
+        if (!atomic_dec_and_test(&bb.done))
                 wait_for_completion(&wait);
 
         if (!test_bit(BIO_UPTODATE, &bb.flags))