summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-03-01 15:17:34 -0800
committerSage Weil <sage@newdream.net>2010-03-01 15:28:01 -0800
commit7af8f1e4aa86720840d3318e4dc225c3c7e5a6d0 (patch)
tree56129109512f2a01f4589a269f1494b6a5cb58d8
parente53a8fd773065628b24605b289a9a40ee4a35d83 (diff)
downloadop-kernel-dev-7af8f1e4aa86720840d3318e4dc225c3c7e5a6d0.zip
op-kernel-dev-7af8f1e4aa86720840d3318e4dc225c3c7e5a6d0.tar.gz
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>
-rw-r--r--fs/ceph/caps.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 06f1979..295b7e54 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;
OpenPOWER on IntegriCloud