diff options
author | Stefan Bader <stefan.bader@canonical.com> | 2012-06-04 17:36:10 +0200 |
---|---|---|
committer | John Rigby <jcrigby@jcrigby-laptop.(none)> | 2012-06-12 16:17:30 -0600 |
commit | 311042497928a4e3041d4b719a53c4099eec1af4 (patch) | |
tree | 1de0ed291ac01e4403c9ba333e895e92ae90009b | |
parent | 7121b8c3689185384896d6f4c358aa80a482f134 (diff) |
UBUNTU: SAUCE: Fix compile failures of dm-raid45
Must include module.h explicitely now. Also remove one
compile time test which does not work anymore (will get
rid of a warning).
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
-rw-r--r-- | ubuntu/dm-raid4-5/dm-memcache.c | 1 | ||||
-rw-r--r-- | ubuntu/dm-raid4-5/dm-message.c | 1 | ||||
-rw-r--r-- | ubuntu/dm-raid4-5/dm-raid4-5.c | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/ubuntu/dm-raid4-5/dm-memcache.c b/ubuntu/dm-raid4-5/dm-memcache.c index 1b15859b276..346abb431b3 100644 --- a/ubuntu/dm-raid4-5/dm-memcache.c +++ b/ubuntu/dm-raid4-5/dm-memcache.c @@ -19,6 +19,7 @@ #include "dm-memcache.h" #include <linux/dm-io.h> #include <linux/slab.h> +#include <linux/module.h> struct dm_mem_cache_client { spinlock_t lock; diff --git a/ubuntu/dm-raid4-5/dm-message.c b/ubuntu/dm-raid4-5/dm-message.c index a66b0152cb3..de21e52c76e 100644 --- a/ubuntu/dm-raid4-5/dm-message.c +++ b/ubuntu/dm-raid4-5/dm-message.c @@ -14,6 +14,7 @@ #include "dm.h" #include "dm-message.h" #include <linux/kernel.h> +#include <linux/module.h> #define DM_MSG_PREFIX "dm_message" diff --git a/ubuntu/dm-raid4-5/dm-raid4-5.c b/ubuntu/dm-raid4-5/dm-raid4-5.c index 88db7958b8d..e05b0e14e34 100644 --- a/ubuntu/dm-raid4-5/dm-raid4-5.c +++ b/ubuntu/dm-raid4-5/dm-raid4-5.c @@ -54,6 +54,7 @@ static const char *version = "v0.2594b"; #include "dm-region-hash.h" #include <linux/slab.h> +#include <linux/module.h> /* * Configurable parameters @@ -173,9 +174,13 @@ enum chunk_flags { CHUNK_UPTODATE, /* Chunk pages are uptodate. */ }; +/* + * This does not work anymore with __REQ_* values being enums + * #if READ != 0 || WRITE != 1 #error dm-raid45: READ/WRITE != 0/1 used as index!!! #endif +*/ enum bl_type { WRITE_QUEUED = WRITE + 1, |