From c4faea3b8b4506c660b5f67e308f4581576e40c7 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 1 Mar 2010 15:17:34 -0800
Subject: [PATCH] --- yaml --- r: 188743 b: refs/heads/master c:
 7af8f1e4aa86720840d3318e4dc225c3c7e5a6d0 h: refs/heads/master i:   188741:
 694e8346ca9e9ff53d862107a62a0d524d97e1f5   188739:
 f2cffbceb1b2fd46d5fc41dc76363400a91fb613   188735:
 dec4c42acf386b54deed991777333949079b59a2 v: v3

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

diff --git a/[refs] b/[refs]
index d803ed5f7525..c715072c96b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e53a8fd773065628b24605b289a9a40ee4a35d83
+refs/heads/master: 7af8f1e4aa86720840d3318e4dc225c3c7e5a6d0
diff --git a/trunk/fs/ceph/caps.c b/trunk/fs/ceph/caps.c
index 06f197983be6..295b7e547a31 100644
--- a/trunk/fs/ceph/caps.c
+++ b/trunk/fs/ceph/caps.c
@@ -655,7 +655,7 @@ static int __cap_is_valid(struct ceph_cap *cap)
  */
 int __ceph_caps_issued(struct ceph_inode_info *ci, int *implemented)
 {
-	int have = ci->i_snap_caps;
+	int have = ci->i_snap_caps | ci->i_cap_exporting_issued;
 	struct ceph_cap *cap;
 	struct rb_node *p;