From 394543b81f6249e59b1dd320bc191f2decbb886c Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Fri, 11 Dec 2009 08:55:23 -0800
Subject: [PATCH] --- yaml --- r: 188647 b: refs/heads/master c:
 d4a780ce8821a37dd135f15b6150a5bfc5604f29 h: refs/heads/master i:   188645:
 49ea2082aded198482744b261072e2affa69b976   188643:
 b2198e41c7ec1843df6abc877e6a83bc80f28887   188639:
 55addc22edfa573175590a53ea77c033121dc20b v: v3

---
 [refs]                     | 2 +-
 trunk/fs/ceph/mon_client.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 59adb275b9ee..39ee3909ce43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 767ea5c33a360ce88da24e296e802dace5821799
+refs/heads/master: d4a780ce8821a37dd135f15b6150a5bfc5604f29
diff --git a/trunk/fs/ceph/mon_client.c b/trunk/fs/ceph/mon_client.c
index 1dd0dc258c50..a76da5e6dbdd 100644
--- a/trunk/fs/ceph/mon_client.c
+++ b/trunk/fs/ceph/mon_client.c
@@ -320,17 +320,18 @@ static void ceph_monc_handle_map(struct ceph_mon_client *monc,
 	if (IS_ERR(monmap)) {
 		pr_err("problem decoding monmap, %d\n",
 		       (int)PTR_ERR(monmap));
-		return;
+		goto out;
 	}
 
 	if (ceph_check_fsid(monc->client, &monmap->fsid) < 0) {
 		kfree(monmap);
-		return;
+		goto out;
 	}
 
 	client->monc.monmap = monmap;
 	kfree(old);
 
+out:
 	mutex_unlock(&monc->mutex);
 	wake_up(&client->mount_wq);
 }