From ca84391b76e110328bcbcc1f91411acb3ee83996 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 13 May 2010 09:06:02 -0700
Subject: [PATCH] --- yaml --- r: 198087 b: refs/heads/master c:
 85792d0dd6e7a7a18fba55c97e49871211b28fe0 h: refs/heads/master i:   198085:
 758c0ff40f3fdf9a95c6e24d1689c2089a5ea8e5   198083:
 06142cd11dd64fc204b3f2ed3b8254da4d1b52b5   198079:
 5e849a4fe8b4095036ddf6cadc9862f3ec9524d9 v: v3

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

diff --git a/[refs] b/[refs]
index 56eb25181dab..62533f16cbc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aba558e28ac40a598542d995c09efa8439ee3ed4
+refs/heads/master: 85792d0dd6e7a7a18fba55c97e49871211b28fe0
diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c
index 114bada97c16..40dd437a26a9 100644
--- a/trunk/fs/ceph/mds_client.c
+++ b/trunk/fs/ceph/mds_client.c
@@ -1871,6 +1871,12 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg)
 		mutex_unlock(&mdsc->mutex);
 		goto out;
 	}
+	if (req->r_got_safe && !head->safe) {
+		pr_warning("got unsafe after safe on %llu from mds%d\n",
+			   tid, mds);
+		mutex_unlock(&mdsc->mutex);
+		goto out;
+	}
 
 	result = le32_to_cpu(head->result);