diff --git a/[refs] b/[refs]
index 420809173863..4401ed51e22d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 498f0103ea13123e007660def9072a0b7dd1c599
+refs/heads/master: 30e4171bfe3d1c49689803338005cc0071dddaff
diff --git a/trunk/drivers/md/dm-flakey.c b/trunk/drivers/md/dm-flakey.c
index ea790623c30b..70a69b2f93d2 100644
--- a/trunk/drivers/md/dm-flakey.c
+++ b/trunk/drivers/md/dm-flakey.c
@@ -79,6 +79,7 @@ static int flakey_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 	}
 
 	ti->num_flush_requests = 1;
+	ti->num_discard_requests = 1;
 	ti->private = fc;
 	return 0;
 
@@ -99,7 +100,7 @@ static sector_t flakey_map_sector(struct dm_target *ti, sector_t bi_sector)
 {
 	struct flakey_c *fc = ti->private;
 
-	return fc->start + (bi_sector - ti->begin);
+	return fc->start + dm_target_offset(ti, bi_sector);
 }
 
 static void flakey_map_bio(struct dm_target *ti, struct bio *bio)