From patchwork Mon Jun 4 15:36:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/2] UBUNTU: ubuntu: Fix compile failures of dm-raid45 Date: Mon, 04 Jun 2012 05:36:10 -0000 From: Stefan Bader X-Patchwork-Id: 162820 Message-Id: <1338824171-17216-2-git-send-email-stefan.bader@canonical.com> To: kernel-team@lists.ubuntu.com 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 --- 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 #include +#include 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 +#include #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 +#include /* * 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,