Merge branch 'linus' into cont_syslog

[safe/jmp/linux-2.6] / drivers / md / dm.h

diff --git a/drivers/md/dm.h b/drivers/md/dm.h
index 604a5f2..bad1724 100644 (file)
--- a/drivers/md/dm.h
+++ b/drivers/md/dm.h
@@ -94,6 +94,11 @@ int dm_split_args(int *argc, char ***argvp, char *input);
 int dm_deleting_md(struct mapped_device *md);
 
 /*
+ * Is this mapped_device suspended?
+ */
+int dm_suspended_md(struct mapped_device *md);
+
+/*
  * The device-mapper can be driven through one of two interfaces;
  * ioctl or filesystem, depending which patch you have applied.
  */
@@ -120,8 +125,8 @@ void dm_stripe_exit(void);
 int dm_open_count(struct mapped_device *md);
 int dm_lock_for_deletion(struct mapped_device *md);
 
-void dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
-                      unsigned cookie);
+int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
+                     unsigned cookie);
 
 int dm_io_init(void);
 void dm_io_exit(void);