[PATCH] dm table: add target preresume

This patch adds a target preresume hook.

It is called before the targets are resumed and if it returns an error the
resume gets cancelled.

The crypt target will use this to indicate that it is unable to process I/O
because no encryption key has been supplied.

Signed-off-by: Milan Broz <mbroz@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 4 insertions, 2 deletions

diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index d44a99650af3..8cbc46b8e3db 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -57,6 +57,7 @@ typedef int (*dm_endio_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);
 typedef void (*dm_resume_fn) (struct dm_target *ti);
 
 typedef int (*dm_status_fn) (struct dm_target *ti, status_type_t status_type,
@@ -92,6 +93,7 @@ struct target_type {
         dm_endio_fn end_io;
         dm_presuspend_fn presuspend;
         dm_postsuspend_fn postsuspend;
+        dm_preresume_fn preresume;
         dm_resume_fn resume;
         dm_status_fn status;
         dm_message_fn message;
diff --git a/include/linux/dm-ioctl.h b/include/linux/dm-ioctl.h
index b349b768df35..f28b5c87aa6b 100644
--- a/include/linux/dm-ioctl.h
+++ b/include/linux/dm-ioctl.h
@@ -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        8
+#define DM_VERSION_MINOR        9
 #define DM_VERSION_PATCHLEVEL   0
-#define DM_VERSION_EXTRA        "-ioctl (2006-06-24)"
+#define DM_VERSION_EXTRA        "-ioctl (2006-09-14)"
 
 /* Status bits */
 #define DM_READONLY_FLAG        (1 << 0) /* In/Out */