1 files changed, 19 insertions, 30 deletions

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index dc48c2585feb..6963ad148408 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -75,7 +75,6 @@ union map_info *dm_get_mapinfo(struct bio *bio)
  */
 struct dm_wq_req {
         enum {
-                DM_WQ_FLUSH_ALL,
                 DM_WQ_FLUSH_DEFERRED,
         } type;
         struct work_struct work;
@@ -150,40 +149,40 @@ static struct kmem_cache *_tio_cache;
 
 static int __init local_init(void)
 {
-        int r;
+        int r = -ENOMEM;
 
         /* allocate a slab for the dm_ios */
         _io_cache = KMEM_CACHE(dm_io, 0);
         if (!_io_cache)
-                return -ENOMEM;
+                return r;
 
         /* allocate a slab for the target ios */
         _tio_cache = KMEM_CACHE(dm_target_io, 0);
-        if (!_tio_cache) {
-                kmem_cache_destroy(_io_cache);
-                return -ENOMEM;
-        }
+        if (!_tio_cache)
+                goto out_free_io_cache;
 
         r = dm_uevent_init();
-        if (r) {
-                kmem_cache_destroy(_tio_cache);
-                kmem_cache_destroy(_io_cache);
-                return r;
-        }
+        if (r)
+                goto out_free_tio_cache;
 
         _major = major;
         r = register_blkdev(_major, _name);
-        if (r < 0) {
-                kmem_cache_destroy(_tio_cache);
-                kmem_cache_destroy(_io_cache);
-                dm_uevent_exit();
-                return r;
-        }
+        if (r < 0)
+                goto out_uevent_exit;
 
         if (!_major)
                 _major = r;
 
         return 0;
+
+out_uevent_exit:
+        dm_uevent_exit();
+out_free_tio_cache:
+        kmem_cache_destroy(_tio_cache);
+out_free_io_cache:
+        kmem_cache_destroy(_io_cache);
+
+        return r;
 }
 
 static void local_exit(void)
@@ -658,6 +657,7 @@ static struct bio *split_bvec(struct bio *bio, sector_t sector,
         clone->bi_size = to_bytes(len);
         clone->bi_io_vec->bv_offset = offset;
         clone->bi_io_vec->bv_len = clone->bi_size;
+        clone->bi_flags |= 1 << BIO_CLONED;
 
         return clone;
 }
@@ -1383,9 +1383,6 @@ static void dm_wq_work(struct work_struct *work)
 
         down_write(&md->io_lock);
         switch (req->type) {
-        case DM_WQ_FLUSH_ALL:
-                __merge_pushback_list(md);
-                /* pass through */
         case DM_WQ_FLUSH_DEFERRED:
                 __flush_deferred_io(md);
                 break;
@@ -1515,7 +1512,7 @@ int dm_suspend(struct mapped_device *md, unsigned suspend_flags)
                 if (!md->suspended_bdev) {
                         DMWARN("bdget failed in dm_suspend");
                         r = -ENOMEM;
-                        goto flush_and_out;
+                        goto out;
                 }
 
                 /*
@@ -1566,14 +1563,6 @@ int dm_suspend(struct mapped_device *md, unsigned suspend_flags)
 
         set_bit(DMF_SUSPENDED, &md->flags);
 
-flush_and_out:
-        if (r && noflush)
-                /*
-                 * Because there may be already I/Os in the pushback list,
-                 * flush them before return.
-                 */
-                dm_queue_flush(md, DM_WQ_FLUSH_ALL, NULL);
-
 out:
         if (r && md->suspended_bdev) {
                 bdput(md->suspended_bdev);