diff --git a/[refs] b/[refs] index 9a04fb758793..0e7d2f9e52fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87b315a5b5cec5d7086494b203577602f5befc8c +refs/heads/master: ec4318bcb4c59d8b8bf7037c9f444a9887ccb265 diff --git a/trunk/fs/ceph/snap.c b/trunk/fs/ceph/snap.c index 8a43bc8675eb..df04e210a055 100644 --- a/trunk/fs/ceph/snap.c +++ b/trunk/fs/ceph/snap.c @@ -314,9 +314,9 @@ static int build_snap_context(struct ceph_snap_realm *realm) because we rebuild_snap_realms() works _downward_ in hierarchy after each update.) */ if (realm->cached_context && - realm->cached_context->seq <= realm->seq && + realm->cached_context->seq == realm->seq && (!parent || - realm->cached_context->seq <= parent->cached_context->seq)) { + realm->cached_context->seq >= parent->cached_context->seq)) { dout("build_snap_context %llx %p: %p seq %lld (%d snaps)" " (unchanged)\n", realm->ino, realm, realm->cached_context,