From 0831c6c2799df913461521f61d21ff5d2b3ea035 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 18 Jan 2011 08:48:06 -0800
Subject: [PATCH] --- yaml --- r: 232523 b: refs/heads/master c:
 24be0c481067560b11441e794e27f166a3568863 h: refs/heads/master i:   232521:
 ac12f2435dd4490097cd09a9b0ee8a607f03316e   232519:
 ea03b21a8d0cec048bf9f7fc46ecae05a06d313f v: v3

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

diff --git a/[refs] b/[refs]
index 5bb6fdc42d39..bd90e89428b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50aac4fec503960380ab594a93a6fbfdf3f8915f
+refs/heads/master: 24be0c481067560b11441e794e27f166a3568863
diff --git a/trunk/fs/ceph/caps.c b/trunk/fs/ceph/caps.c
index 60d27bc9eb83..f654c7e933ac 100644
--- a/trunk/fs/ceph/caps.c
+++ b/trunk/fs/ceph/caps.c
@@ -1658,6 +1658,8 @@ void ceph_check_caps(struct ceph_inode_info *ci, int flags,
 
 		if (cap == ci->i_auth_cap && ci->i_dirty_caps)
 			flushing = __mark_caps_flushing(inode, session);
+		else
+			flushing = 0;
 
 		mds = cap->mds;  /* remember mds, so we don't repeat */
 		sent++;