From 37e3d1c0522cdfa233c12010a96fa6f414fb9c51 Mon Sep 17 00:00:00 2001
From: Stanislav Fomichev <kernel@fomichev.me>
Date: Sat, 5 Feb 2011 23:13:01 +0000
Subject: [PATCH] --- yaml --- r: 234113 b: refs/heads/master c:
 b9f810570d9cc13177128e11a74e22d37aa68a1a h: refs/heads/master i:   234111:
 eb2d3ab73b8872e530eca99c088e1e40b610f023 v: v3

---
 [refs]                           | 2 +-
 trunk/fs/nfs/nfs4filelayoutdev.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 94d73a131b9c..dad23754231c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5e502681007779d4762fb3ef7e80a3ecd1cfe6b
+refs/heads/master: b9f810570d9cc13177128e11a74e22d37aa68a1a
diff --git a/trunk/fs/nfs/nfs4filelayoutdev.c b/trunk/fs/nfs/nfs4filelayoutdev.c
index f5c9b125e8cc..b73c34375f60 100644
--- a/trunk/fs/nfs/nfs4filelayoutdev.c
+++ b/trunk/fs/nfs/nfs4filelayoutdev.c
@@ -219,6 +219,10 @@ decode_and_add_ds(__be32 **pp, struct inode *inode)
 		goto out_err;
 	}
 	buf = kmalloc(rlen + 1, GFP_KERNEL);
+	if (!buf) {
+		dprintk("%s: Not enough memory\n", __func__);
+		goto out_err;
+	}
 	buf[rlen] = '\0';
 	memcpy(buf, r_addr, rlen);