diff options
author | Olaf Hering <olh@suse.de> | 2005-07-27 14:45:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 19:26:08 -0400 |
commit | 44456d37b59d8e541936ed26d8b6e08d27e88ac1 (patch) | |
tree | 11ca6fa29b8cfb56ecef2d1f4f9dc2d9d71d2a2f /drivers/md/bitmap.c | |
parent | 02b775696fee75a04041d8d94db26a9462216d24 (diff) |
[PATCH] turn many #if $undefined_string into #ifdef $undefined_string
turn many #if $undefined_string into #ifdef $undefined_string to fix some
warnings after -Wno-def was added to global CFLAGS
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/md/bitmap.c')
-rw-r--r-- | drivers/md/bitmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 0c2ed99a3832..70bca955e0de 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c | |||
@@ -108,7 +108,7 @@ static unsigned char *bitmap_alloc_page(struct bitmap *bitmap) | |||
108 | { | 108 | { |
109 | unsigned char *page; | 109 | unsigned char *page; |
110 | 110 | ||
111 | #if INJECT_FAULTS_1 | 111 | #ifdef INJECT_FAULTS_1 |
112 | page = NULL; | 112 | page = NULL; |
113 | #else | 113 | #else |
114 | page = kmalloc(PAGE_SIZE, GFP_NOIO); | 114 | page = kmalloc(PAGE_SIZE, GFP_NOIO); |
@@ -843,7 +843,7 @@ static int bitmap_init_from_disk(struct bitmap *bitmap, int in_sync) | |||
843 | 843 | ||
844 | BUG_ON(!file && !bitmap->offset); | 844 | BUG_ON(!file && !bitmap->offset); |
845 | 845 | ||
846 | #if INJECT_FAULTS_3 | 846 | #ifdef INJECT_FAULTS_3 |
847 | outofdate = 1; | 847 | outofdate = 1; |
848 | #else | 848 | #else |
849 | outofdate = bitmap->flags & BITMAP_STALE; | 849 | outofdate = bitmap->flags & BITMAP_STALE; |
@@ -1187,7 +1187,7 @@ static int bitmap_start_daemon(struct bitmap *bitmap, mdk_thread_t **ptr, | |||
1187 | 1187 | ||
1188 | spin_unlock_irqrestore(&bitmap->lock, flags); | 1188 | spin_unlock_irqrestore(&bitmap->lock, flags); |
1189 | 1189 | ||
1190 | #if INJECT_FATAL_FAULT_2 | 1190 | #ifdef INJECT_FATAL_FAULT_2 |
1191 | daemon = NULL; | 1191 | daemon = NULL; |
1192 | #else | 1192 | #else |
1193 | sprintf(namebuf, "%%s_%s", name); | 1193 | sprintf(namebuf, "%%s_%s", name); |
@@ -1552,7 +1552,7 @@ int bitmap_create(mddev_t *mddev) | |||
1552 | 1552 | ||
1553 | bitmap->syncchunk = ~0UL; | 1553 | bitmap->syncchunk = ~0UL; |
1554 | 1554 | ||
1555 | #if INJECT_FATAL_FAULT_1 | 1555 | #ifdef INJECT_FATAL_FAULT_1 |
1556 | bitmap->bp = NULL; | 1556 | bitmap->bp = NULL; |
1557 | #else | 1557 | #else |
1558 | bitmap->bp = kmalloc(pages * sizeof(*bitmap->bp), GFP_KERNEL); | 1558 | bitmap->bp = kmalloc(pages * sizeof(*bitmap->bp), GFP_KERNEL); |