From 9adcc6a4da0bdd18b09ca2f673b8b49d756dc30d Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Fri, 7 May 2010 10:27:14 +0200
Subject: [PATCH] --- yaml --- r: 198075 b: refs/heads/master c:
 a5ee751c15016d0deee0d651e42a3b163ea73ade h: refs/heads/master i:   198073:
 40c8d40d2d1a55dc506f7f297037b25ad7ae0ce5   198071:
 872f6365711a1a64ecf7d842c269dc24d14a7aaf v: v3

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

diff --git a/[refs] b/[refs]
index b6115537cb65..d9c92eeed72b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f8605f2bde2c69737709765dfc574558ea35d4e
+refs/heads/master: a5ee751c15016d0deee0d651e42a3b163ea73ade
diff --git a/trunk/fs/ceph/caps.c b/trunk/fs/ceph/caps.c
index 74c74842c860..0e85d3c80790 100644
--- a/trunk/fs/ceph/caps.c
+++ b/trunk/fs/ceph/caps.c
@@ -1718,10 +1718,9 @@ static int try_flush_caps(struct inode *inode, struct ceph_mds_session *session,
 static int caps_are_flushed(struct inode *inode, unsigned tid)
 {
 	struct ceph_inode_info *ci = ceph_inode(inode);
-	int dirty, i, ret = 1;
+	int i, ret = 1;
 
 	spin_lock(&inode->i_lock);
-	dirty = __ceph_caps_dirty(ci);
 	for (i = 0; i < CEPH_CAP_BITS; i++)
 		if ((ci->i_flushing_caps & (1 << i)) &&
 		    ci->i_cap_flush_tid[i] <= tid) {