diff --git a/[refs] b/[refs] index 807edc830ca0..046781cc5acd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9d177443134bc4ac1c1393af69e2a8704bcac09 +refs/heads/master: 0eb6cd49f6e3ec523787d09cf08d3179be270db4 diff --git a/trunk/fs/ceph/caps.c b/trunk/fs/ceph/caps.c index 51546d54b841..7bf182b03973 100644 --- a/trunk/fs/ceph/caps.c +++ b/trunk/fs/ceph/caps.c @@ -2384,7 +2384,7 @@ static void handle_cap_grant(struct inode *inode, struct ceph_mds_caps *grant, ceph_cap_string(cap->issued), ceph_cap_string(newcaps), ceph_cap_string(revoking)); - if (revoking & CEPH_CAP_FILE_BUFFER) + if (revoking & used & CEPH_CAP_FILE_BUFFER) writeback = 1; /* initiate writeback; will delay ack */ else if (revoking == CEPH_CAP_FILE_CACHE && (newcaps & CEPH_CAP_FILE_LAZYIO) == 0 &&