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 06f197983be686ac725758bb59e5aae4a6caa2b2..295b7e547a31c9e85cce0d15251b734d26e9aa23 100644 (file)
--- 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;