From 17a87ce0aef07a45eddda04ad236621470c89987 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Sat, 20 Mar 2010 20:43:28 -0700
Subject: [PATCH] --- yaml --- r: 189212 b: refs/heads/master c:
 9c423956b8a495f0c048143abc5da955a70eac97 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d0bb4b75c201..5a9806e8fa91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f883c24de33ba929c95e018ac0ba66e4f46734b
+refs/heads/master: 9c423956b8a495f0c048143abc5da955a70eac97
diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c
index 5cbf46abfee3..b6b5348055fc 100644
--- a/trunk/fs/ceph/mds_client.c
+++ b/trunk/fs/ceph/mds_client.c
@@ -1567,8 +1567,13 @@ static int __do_request(struct ceph_mds_client *mdsc,
 
 	/* get, open session */
 	session = __ceph_lookup_mds_session(mdsc, mds);
-	if (!session)
+	if (!session) {
 		session = register_session(mdsc, mds);
+		if (IS_ERR(session)) {
+			err = PTR_ERR(session);
+			goto finish;
+		}
+	}
 	dout("do_request mds%d session %p state %s\n", mds, session,
 	     session_state_name(session->s_state));
 	if (session->s_state != CEPH_MDS_SESSION_OPEN &&