From 4e013468105bd024d1f986eebaf85bc3ff406e00 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 20 Mar 2010 15:30:16 +0300
Subject: [PATCH] --- yaml --- r: 189213 b: refs/heads/master c:
 4736b009b880b7c19bea36327a71032a6dbee402 h: refs/heads/master i:   189211:
 e5efe532410267b88f0934d1fb9dac568b89981e v: v3

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

diff --git a/[refs] b/[refs]
index 5a9806e8fa91..788483f0e883 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c423956b8a495f0c048143abc5da955a70eac97
+refs/heads/master: 4736b009b880b7c19bea36327a71032a6dbee402
diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c
index b6b5348055fc..ad0fbc3128d3 100644
--- a/trunk/fs/ceph/mds_client.c
+++ b/trunk/fs/ceph/mds_client.c
@@ -328,6 +328,8 @@ static struct ceph_mds_session *register_session(struct ceph_mds_client *mdsc,
 	struct ceph_mds_session *s;
 
 	s = kzalloc(sizeof(*s), GFP_NOFS);
+	if (!s)
+		return ERR_PTR(-ENOMEM);
 	s->s_mdsc = mdsc;
 	s->s_mds = mds;
 	s->s_state = CEPH_MDS_SESSION_NEW;