---

yaml --- r: 33620 b: refs/heads/master c: c06aad8 h: refs/heads/master v: v3
git-mirror · Aug 27, 2006 · 0a14256 · 0a14256
1 parent 47a258d
commit 0a14256
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a654518e1b774b8e8f74a819fd12a931e7672c9
+refs/heads/master: c06aad854fdb9da38fcc22dccfe9d72919453e43
diff --git a/trunk/drivers/md/dm-raid1.c b/trunk/drivers/md/dm-raid1.c
@@ -255,7 +255,9 @@ static struct region *__rh_alloc(struct region_hash *rh, region_t region)
 	struct region *reg, *nreg;
 
 	read_unlock(&rh->hash_lock);
-	nreg = mempool_alloc(rh->region_pool, GFP_NOIO);
+	nreg = mempool_alloc(rh->region_pool, GFP_ATOMIC);
+	if (unlikely(!nreg))
+		nreg = kmalloc(sizeof(struct region), GFP_NOIO);
 	nreg->state = rh->log->type->in_sync(rh->log, region, 1) ?
 		RH_CLEAN : RH_NOSYNC;
 	nreg->rh = rh;