From: Mike Snitzer <snitzer@redhat.com>
Date: Fri, 29 May 2015 18:17:16 +0000 (-0400)
Subject: Merge remote-tracking branch 'jens/for-4.2/core' into dm-4.2
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~7974^2~39
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=183f7802e73e26206558864d1b67e64382257277;p=mirror_ubuntu-artful-kernel.git

Merge remote-tracking branch 'jens/for-4.2/core' into dm-4.2
---

183f7802e73e26206558864d1b67e64382257277
diff --cc drivers/md/dm.c
index 2caf492890d6,38837f8ea327..4d6f089a0e9e
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@@ -1087,8 -1036,8 +1036,6 @@@ static void free_rq_clone(struct reques
  	struct dm_rq_target_io *tio = clone->end_io_data;
  	struct mapped_device *md = tio->md;
  
- 	blk_rq_unprep_clone(clone);
 -	WARN_ON_ONCE(must_be_mapped && !clone->q);
--
  	if (md->type == DM_TYPE_MQ_REQUEST_BASED)
  		/* stacked on blk-mq queue(s) */
  		tio->ti->type->release_clone_rq(clone);
@@@ -1977,13 -1887,9 +1893,9 @@@ static int map_request(struct dm_rq_tar
  			dm_kill_unmapped_request(rq, r);
  			return r;
  		}
 -		if (IS_ERR(clone))
 -			return DM_MAPIO_REQUEUE;
 +		if (r != DM_MAPIO_REMAPPED)
 +			return r;
- 		if (setup_clone(clone, rq, tio, GFP_ATOMIC)) {
- 			/* -ENOMEM */
- 			ti->type->release_clone_rq(clone);
- 			return DM_MAPIO_REQUEUE;
- 		}
+ 		setup_clone(clone, rq, tio);
  	}
  
  	switch (r) {