summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-03-08 15:27:53 -0800
committerSage Weil <sage@newdream.net>2010-03-20 21:33:06 -0700
commit978097c907b58a2d085bbf7632bee1a5a7e6f6ba (patch)
tree1d52869c500f7b6d5c0566011c070e0924dbe57f /fs
parent220bf991b0366cc50a94feede3d7341fa5710ee4 (diff)
downloadlinux-978097c907b58a2d085bbf7632bee1a5a7e6f6ba.tar.gz
linux-978097c907b58a2d085bbf7632bee1a5a7e6f6ba.tar.bz2
linux-978097c907b58a2d085bbf7632bee1a5a7e6f6ba.zip
ceph: implemented caps should always be superset of issued caps
Added assertion, and cleared one case where the implemented caps were not following the issued caps. Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net> Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/caps.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index db122bb357b8..57d9b44a8820 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -2334,6 +2334,7 @@ static int handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant,
revoked_rdcache)
reply = 2; /* send revoke ack in check_caps */
cap->issued = newcaps;
+ cap->implemented |= newcaps;
} else if (cap->issued == newcaps) {
dout("caps unchanged: %s -> %s\n",
ceph_cap_string(cap->issued), ceph_cap_string(newcaps));
@@ -2346,6 +2347,7 @@ static int handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant,
* pending revocation */
wake = 1;
}
+ BUG_ON(cap->issued & ~cap->implemented);
spin_unlock(&inode->i_lock);
if (writeback)