Merge pull request #13398 from liewegas/wip-pgnls-snaps

osd: drop support for listing objects at a given snap

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

diff --cc src/osd/PrimaryLogPG.cc
index daf667aa959b3f026d1fb020b8664a5c9bc0054c,f001fc34822460f45bb66c92c4c5ecfa98dacd31..2ed79b3f3e5e455703fbcd1839a0c6a8740a80d3
--- 1/src/osd/PrimaryLogPG.cc
--- 2/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@@ -1352,34 -1322,11 +1320,11 @@@ void PrimaryLogPG::do_pg_op(OpRequestRe
          if (candidate.snap == CEPH_SNAPDIR)
            continue;
  
-         if (candidate.snap < snapid)
+         if (candidate.snap != CEPH_NOSNAP)
            continue;
  
-         if (snapid != CEPH_NOSNAP) {
-           bufferlist bl;
-           if (candidate.snap == CEPH_NOSNAP) {
-             pgbackend->objects_get_attr(
-               candidate,
-               SS_ATTR,
-               &bl);
-             SnapSet snapset(bl);
-             if (snapid <= snapset.seq)
-               continue;
-           } else {
-             bufferlist attr_bl;
-             pgbackend->objects_get_attr(
-               candidate, OI_ATTR, &attr_bl);
-             object_info_t oi(attr_bl);
-             vector<snapid_t>::iterator i = find(oi.snaps.begin(),
-                                                 oi.snaps.end(),
-                                                 snapid);
-             if (i == oi.snaps.end())
-               continue;
-           }
-         }
- 
          // skip wrong namespace
 -        if (candidate.get_namespace() != m->get_object_locator().nspace)
 +        if (candidate.get_namespace() != m->get_hobj().nspace)
            continue;
  
          if (filter && !pgls_filter(filter, candidate, filter_out))

diff --cc src/osd/PrimaryLogPG.h
Simple merge