projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] turn many #if $undefined_string into #ifdef $undefined_string
[deliverable/linux.git]
/
drivers
/
md
/
bitmap.c
diff --git
a/drivers/md/bitmap.c
b/drivers/md/bitmap.c
index 0c2ed99a383227ac0cfeb7429bdde4756717097f..70bca955e0de86c4003cdb919885518d4243b2d3 100644
(file)
--- a/
drivers/md/bitmap.c
+++ b/
drivers/md/bitmap.c
@@
-108,7
+108,7
@@
static unsigned char *bitmap_alloc_page(struct bitmap *bitmap)
{
unsigned char *page;
{
unsigned char *page;
-#if INJECT_FAULTS_1
+#if
def
INJECT_FAULTS_1
page = NULL;
#else
page = kmalloc(PAGE_SIZE, GFP_NOIO);
page = NULL;
#else
page = kmalloc(PAGE_SIZE, GFP_NOIO);
@@
-843,7
+843,7
@@
static int bitmap_init_from_disk(struct bitmap *bitmap, int in_sync)
BUG_ON(!file && !bitmap->offset);
BUG_ON(!file && !bitmap->offset);
-#if INJECT_FAULTS_3
+#if
def
INJECT_FAULTS_3
outofdate = 1;
#else
outofdate = bitmap->flags & BITMAP_STALE;
outofdate = 1;
#else
outofdate = bitmap->flags & BITMAP_STALE;
@@
-1187,7
+1187,7
@@
static int bitmap_start_daemon(struct bitmap *bitmap, mdk_thread_t **ptr,
spin_unlock_irqrestore(&bitmap->lock, flags);
spin_unlock_irqrestore(&bitmap->lock, flags);
-#if INJECT_FATAL_FAULT_2
+#if
def
INJECT_FATAL_FAULT_2
daemon = NULL;
#else
sprintf(namebuf, "%%s_%s", name);
daemon = NULL;
#else
sprintf(namebuf, "%%s_%s", name);
@@
-1552,7
+1552,7
@@
int bitmap_create(mddev_t *mddev)
bitmap->syncchunk = ~0UL;
bitmap->syncchunk = ~0UL;
-#if INJECT_FATAL_FAULT_1
+#if
def
INJECT_FATAL_FAULT_1
bitmap->bp = NULL;
#else
bitmap->bp = kmalloc(pages * sizeof(*bitmap->bp), GFP_KERNEL);
bitmap->bp = NULL;
#else
bitmap->bp = kmalloc(pages * sizeof(*bitmap->bp), GFP_KERNEL);
This page took
0.027805 seconds
and
5
git commands to generate.