From 5e849a4fe8b4095036ddf6cadc9862f3ec9524d9 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 17 Mar 2010 16:30:21 -0700
Subject: [PATCH] --- yaml --- r: 198079 b: refs/heads/master c:
 aab53dd9e81ccefa7b8d88eec5138dd73639a783 h: refs/heads/master i:   198077:
 2d3d62faf3a171ee3bde5c80d53d7433a7820ca9   198075:
 9adcc6a4da0bdd18b09ca2f673b8b49d756dc30d   198071:
 872f6365711a1a64ecf7d842c269dc24d14a7aaf   198063:
 7d8c00b9b5ef4da9de26a0cf2586e28a10c48ac3   198047:
 85dfe32cc78fa5f2d3bff5b8e99da91d04346ab4   198015:
 9baf286869935a923fc321230e554e185e514cc8 v: v3

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

diff --git a/[refs] b/[refs]
index f14a0217bc64..af72f3c0c6be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e01a594646ebbf964b6058e3bf28125379063439
+refs/heads/master: aab53dd9e81ccefa7b8d88eec5138dd73639a783
diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c
index a4d9e5b0fd3d..d45787470fb5 100644
--- a/trunk/fs/ceph/mds_client.c
+++ b/trunk/fs/ceph/mds_client.c
@@ -2647,7 +2647,9 @@ static void delayed_work(struct work_struct *work)
 		else
 			ceph_con_keepalive(&s->s_con);
 		add_cap_releases(mdsc, s, -1);
-		send_cap_releases(mdsc, s);
+		if (s->s_state == CEPH_MDS_SESSION_OPEN ||
+		    s->s_state == CEPH_MDS_SESSION_HUNG)
+			send_cap_releases(mdsc, s);
 		mutex_unlock(&s->s_mutex);
 		ceph_put_mds_session(s);