Subject: [PATCH 06/11] dm: ioctl: add noflush suspend
To: Andrew Morton <[email-masked]>
Cc: [email-masked], [email-masked], Jun'ichi Nomura <[email-masked]>, Kiyoshi Ueda <[email-masked]>

From: Kiyoshi Ueda <[email-masked]>

This patch provides a dm ioctl option to request noflush suspending.
(See next patch for what this is for.)
As the interface is extended, the version number is incremented.

Other than accepting the new option through the interface, There is no change
to existing behaviour.

Test results:
Confirmed the option is given from user-space correctly.

Signed-off-by: Kiyoshi Ueda <[email-masked]>
Signed-off-by: Jun'ichi Nomura <[email-masked]>
Signed-off-by: Alasdair G Kergon <[email-masked]>
Cc: [email-masked]

 drivers/md/dm-ioctl.c    |    4 ++++
 drivers/md/dm.h          |    1 +
 include/linux/dm-ioctl.h |    9 +++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

Index: linux-2.6.19/drivers/md/dm-ioctl.c
===================================================================
--- linux-2.6.19.orig/drivers/md/dm-ioctl.c	2006-12-06 20:49:30.000000000 +0000
+++ linux-2.6.19/drivers/md/dm-ioctl.c	2006-12-06 20:49:32.000000000 +0000
@@ -774,6 +774,8 @@ static int do_suspend(struct dm_ioctl *p
 
 	if (param->flags & DM_SKIP_LOCKFS_FLAG)
 		suspend_flags &= ~DM_SUSPEND_LOCKFS_FLAG;
+	if (param->flags & DM_NOFLUSH_FLAG)
+		suspend_flags |= DM_SUSPEND_NOFLUSH_FLAG;
 
 	if (!dm_suspended(md))
 		r = dm_suspend(md, suspend_flags);
@@ -815,6 +817,8 @@ static int do_resume(struct dm_ioctl *pa
 		/* Suspend if it isn't already suspended */
 		if (param->flags & DM_SKIP_LOCKFS_FLAG)
 			suspend_flags &= ~DM_SUSPEND_LOCKFS_FLAG;
+		if (param->flags & DM_NOFLUSH_FLAG)
+			suspend_flags |= DM_SUSPEND_NOFLUSH_FLAG;
 		if (!dm_suspended(md))
 			dm_suspend(md, suspend_flags);
 
Index: linux-2.6.19/drivers/md/dm.h
===================================================================
--- linux-2.6.19.orig/drivers/md/dm.h	2006-12-06 20:49:31.000000000 +0000
+++ linux-2.6.19/drivers/md/dm.h	2006-12-06 20:49:32.000000000 +0000
@@ -47,6 +47,7 @@
  * Suspend feature flags
  */
 #define DM_SUSPEND_LOCKFS_FLAG		(1 << 0)
+#define DM_SUSPEND_NOFLUSH_FLAG		(1 << 1)
 
 /*
  * List of devices that a metadevice uses and should open/close.
Index: linux-2.6.19/include/linux/dm-ioctl.h
===================================================================
--- linux-2.6.19.orig/include/linux/dm-ioctl.h	2006-12-06 20:48:30.000000000 +0000
+++ linux-2.6.19/include/linux/dm-ioctl.h	2006-12-06 20:49:32.000000000 +0000
@@ -285,9 +285,9 @@ 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	10
+#define DM_VERSION_MINOR	11
 #define DM_VERSION_PATCHLEVEL	0
-#define DM_VERSION_EXTRA	"-ioctl (2006-09-14)"
+#define DM_VERSION_EXTRA	"-ioctl (2006-10-12)"
 
 /* Status bits */
 #define DM_READONLY_FLAG	(1 << 0) /* In/Out */
@@ -323,4 +323,9 @@ typedef char ioctl_struct[308];
  */
 #define DM_SKIP_LOCKFS_FLAG	(1 << 10) /* In */
 
+/*
+ * Set this to suspend without flushing queued ios.
+ */
+#define DM_NOFLUSH_FLAG		(1 << 11) /* In */
+
 #endif				/* _LINUX_DM_IOCTL_H */