From 3549f31bd3edba658bc99309140bbd4d123e9fcf Mon Sep 17 00:00:00 2001
From: yanhai zhu <zhu.yanhai@gmail.com>
Date: Wed, 12 Nov 2008 14:38:54 -0500
Subject: [PATCH] --- yaml --- r: 129023 b: refs/heads/master c:
 7cbd8a839118eede2393f0926b8e15027162bcd6 h: refs/heads/master i:   129021:
 01f63207e3080fe2ab1ea1c04bbaf645c42e7d78   129019:
 467d6fc2cceae4860d62bc7a6969a2d670e14ccd   129015:
 81d7f2a2f572a1a9f2b3ae651d482d08a2c1e97e   129007:
 0e3d2fb6edf5b40aaf2d0cb52e23226c053a7494   128991:
 b3e426bf86b7d99e203377829c2039691e7bdfa3   128959:
 877dc9886e4b39cfa1e86c54ab2480cac1572859   128895:
 6316572da08750918cef7f4e18ed9bd503ec9683   128767:
 b5be283968253d1d482a849afc0e118f80718d22   128511:
 6650f35ceef35f32d9d9adead2d60123fc14fcd2   127999:
 c3235cfcfeead2886fbe3590299afabe7ec72392   126975:
 5a5977599e8e4f8e2f284d41f6ae11c492c8faff v: v3

---
 [refs]                   | 2 +-
 trunk/fs/btrfs/volumes.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ccae48bf8dc4..444ccda9c82c 100644
--- 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
index d6f1996de629..ecf0633ab8cc 100644
--- 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;