Merge branch 'jewel-15303' of git://github.com/ukernel/ceph into greg-fs-testing

Resolve certain issues with incorrectly skipping dentries in listing.

https://github.com/ceph/ceph/pull/8353

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Tested-by: John Spray <john.spray@redhat.com>
This commit is contained in:
Greg Farnum 2016-04-07 17:01:06 -07:00
commit c4e888f90e

View File

@ -4807,7 +4807,7 @@ void Client::handle_cap_grant(MetaSession *session, Inode *in, Cap *cap, MClient
if (m->get_op() == CEPH_CAP_OP_IMPORT && m->get_wanted() != wanted)
check = true;
check_cap_issue(in, cap, issued);
check_cap_issue(in, cap, new_caps);
// update caps
if (old_caps & ~new_caps) {