---

yaml --- r: 309447 b: refs/heads/master c: f8ad495 h: refs/heads/master i: 309445: d30ef4d 309443: 883e96f 309439: 2acd2f5 v: v3
git-mirror · May 14, 2012 · 398bcbe · 398bcbe
1 parent 67d1814
commit 398bcbe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76aa542fb90e3e91edb1146d10ca7cf2cae8e7e9
+refs/heads/master: f8ad495a8a0277b88c59bf38319e5e944aaf5a4a
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
@@ -506,11 +506,11 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
 	header->snap_names_len = le64_to_cpu(ondisk->snap_names_len);
 	if (snap_count) {
 		header->snap_names = kmalloc(header->snap_names_len,
-					     GFP_KERNEL);
+					     gfp_flags);
 		if (!header->snap_names)
 			goto err_snapc;
 		header->snap_sizes = kmalloc(snap_count * sizeof(u64),
-					     GFP_KERNEL);
+					     gfp_flags);
 		if (!header->snap_sizes)
 			goto err_names;
 	} else {