---

yaml --- r: 359560 b: refs/heads/master c: 390306c h: refs/heads/master v: v3
git-mirror · Jan 17, 2013 · 7cf383f · 7cf383f
1 parent e9f7512
commit 7cf383f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66f58691c5c820283dd7e4d6fe8649033ed43ceb
+refs/heads/master: 390306c38dd43908f7f7730229999790a773d1d5
diff --git a/trunk/fs/ceph/caps.c b/trunk/fs/ceph/caps.c
@@ -2429,7 +2429,9 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant,
 		dout("mds wanted %s -> %s\n",
 		     ceph_cap_string(le32_to_cpu(grant->wanted)),
 		     ceph_cap_string(wanted));
-		grant->wanted = cpu_to_le32(wanted);
+		/* imported cap may not have correct mds_wanted */
+		if (le32_to_cpu(grant->op) == CEPH_CAP_OP_IMPORT)
+			check_caps = 1;
 	}
 
 	cap->seq = seq;