Merge ../linus

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

diff --git a/drivers/md/dm.h b/drivers/md/dm.h
index 293d5ce62a2150793b787cdd7a683f931c9eeeb3..2f796b1436b2a6f898fac79f05cf4bee036d04f0 100644 (file)
--- a/drivers/md/dm.h
+++ b/drivers/md/dm.h
@@ -36,17 +36,20 @@
  * Definitions of return values from target end_io function.
  */
 #define DM_ENDIO_INCOMPLETE    1
+#define DM_ENDIO_REQUEUE       2
 
 /*
  * Definitions of return values from target map function.
  */
 #define DM_MAPIO_SUBMITTED     0
 #define DM_MAPIO_REMAPPED      1
+#define DM_MAPIO_REQUEUE       DM_ENDIO_REQUEUE
 
 /*
  * 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.