[PATCH 1/2] UBUNTU: ubuntu: Fix compile failures of dm-raid45
Stefan Bader
stefan.bader at canonical.com
Mon Jun 4 15:36:10 UTC 2012
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 at canonical.com>
---
ubuntu/dm-raid4-5/dm-memcache.c | 1 +
ubuntu/dm-raid4-5/dm-message.c | 1 +
ubuntu/dm-raid4-5/dm-raid4-5.c | 5 +++++
3 files changed, 7 insertions(+)
diff --git a/ubuntu/dm-raid4-5/dm-memcache.c b/ubuntu/dm-raid4-5/dm-memcache.c
index 1b15859..346abb4 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 a66b015..de21e52 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 88db795..e05b0e1 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,
--
1.7.9.5
More information about the kernel-team
mailing list