From: Sage Weil <sage@newdream.net>
Date: Mon, 1 Mar 2010 23:17:34 +0000 (-0800)
Subject: ceph: include migrating caps in issued set
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7af8f1e4aa86720840d3318e4dc225c3c7e5a6d0;p=deliverable%2Flinux.git

ceph: include migrating caps in issued set

We should include caps that are mid-migration (we've received the EXPORT,
but not the IMPORT) in the issued caps set.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 06f197983be6..295b7e547a31 100644
--- a/fs/ceph/caps.c
+++ b/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;