---

yaml --- r: 129023 b: refs/heads/master c: 7cbd8a8 h: refs/heads/master i: 129021: 01f6320 129019: 467d6fc 129015: 81d7f2a 129007: 0e3d2fb 128991: b3e426b 128959: 877dc98 128895: 6316572 128767: b5be283 128511: 6650f35 127999: c3235cf 126975: 5a59775 v: v3
git-mirror · Nov 12, 2008 · 3549f31 · 3549f31
1 parent e227510
commit 3549f31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0df49b911db2b22ea808b596070b1cc65c23d148
+refs/heads/master: 7cbd8a839118eede2393f0926b8e15027162bcd6
diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c
@@ -2755,6 +2755,8 @@ static struct btrfs_device *add_missing_dev(struct btrfs_root *root,
 	struct btrfs_fs_devices *fs_devices = root->fs_info->fs_devices;
 
 	device = kzalloc(sizeof(*device), GFP_NOFS);
+	if (!device)
+		return NULL;
 	list_add(&device->dev_list,
 		 &fs_devices->devices);
 	device->barriers = 1;