From bac7571523b849f2957f4374d94880525978e68a Mon Sep 17 00:00:00 2001
From: Bryn Reeves <breeves@redhat.com>
Date: Tue, 3 Oct 2006 01:15:43 -0700
Subject: [PATCH] --- yaml --- r: 38109 b: refs/heads/master c:
 999d816851c3e080412a19558f111d01852d2f04 h: refs/heads/master i:   38107:
 2ba74dbd232b5dc0f3eb2b63a3fe21c9ebbea728 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/md/dm-table.c         | 5 +++++
 trunk/include/linux/device-mapper.h | 2 ++
 trunk/include/linux/dm-ioctl.h      | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f77e610c0b45..9ae9699be393 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cb4021453a69585e458ec2177677c0c1300dccf
+refs/heads/master: 999d816851c3e080412a19558f111d01852d2f04
diff --git a/trunk/drivers/md/dm-table.c b/trunk/drivers/md/dm-table.c
index 4920998efeeb..05befa91807a 100644
--- a/trunk/drivers/md/dm-table.c
+++ b/trunk/drivers/md/dm-table.c
@@ -1001,6 +1001,11 @@ int dm_table_flush_all(struct dm_table *t)
 {
 	struct list_head *d, *devices = dm_table_get_devices(t);
 	int ret = 0;
+	unsigned i;
+
+	for (i = 0; i < t->num_targets; i++)
+		if (t->targets[i].type->flush)
+			t->targets[i].type->flush(&t->targets[i]);
 
 	for (d = devices->next; d != devices; d = d->next) {
 		struct dm_dev *dd = list_entry(d, struct dm_dev, list);
diff --git a/trunk/include/linux/device-mapper.h b/trunk/include/linux/device-mapper.h
index 7a48d428d0a1..03ef41c1eaac 100644
--- a/trunk/include/linux/device-mapper.h
+++ b/trunk/include/linux/device-mapper.h
@@ -55,6 +55,7 @@ typedef int (*dm_endio_fn) (struct dm_target *ti,
 			    struct bio *bio, int error,
 			    union map_info *map_context);
 
+typedef void (*dm_flush_fn) (struct dm_target *ti);
 typedef void (*dm_presuspend_fn) (struct dm_target *ti);
 typedef void (*dm_postsuspend_fn) (struct dm_target *ti);
 typedef int (*dm_preresume_fn) (struct dm_target *ti);
@@ -96,6 +97,7 @@ struct target_type {
 	dm_dtr_fn dtr;
 	dm_map_fn map;
 	dm_endio_fn end_io;
+	dm_flush_fn flush;
 	dm_presuspend_fn presuspend;
 	dm_postsuspend_fn postsuspend;
 	dm_preresume_fn preresume;
diff --git a/trunk/include/linux/dm-ioctl.h b/trunk/include/linux/dm-ioctl.h
index f28b5c87aa6b..8853fc4d1c5e 100644
--- a/trunk/include/linux/dm-ioctl.h
+++ b/trunk/include/linux/dm-ioctl.h
@@ -285,7 +285,7 @@ typedef char ioctl_struct[308];
 #define DM_DEV_SET_GEOMETRY	_IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
 
 #define DM_VERSION_MAJOR	4
-#define DM_VERSION_MINOR	9
+#define DM_VERSION_MINOR	10
 #define DM_VERSION_PATCHLEVEL	0
 #define DM_VERSION_EXTRA	"-ioctl (2006-09-14)"