]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG::fill_in_copy_get: remove extraneous if statement
authorSamuel Just <sam.just@inktank.com>
Wed, 5 Mar 2014 01:03:37 +0000 (17:03 -0800)
committerSamuel Just <sam.just@inktank.com>
Wed, 5 Mar 2014 03:29:20 +0000 (19:29 -0800)
This should leave the behavior unchanged.

Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/ReplicatedPG.cc

index c95a7e59f70ba33613a2f98a49eb0680ffd05a3a..7ba87c484ada99b2b651e80b75bdad7f44cb5afa 100644 (file)
@@ -5301,11 +5301,9 @@ int ReplicatedPG::fill_in_copy_get(
        osd->store->get_omap_iterator(coll, oi.soid);
       assert(iter);
       iter->upper_bound(cursor.omap_offset);
-      if (iter->valid()) {
-       for (; left > 0 && iter->valid(); iter->next()) {
-         out_omap.insert(make_pair(iter->key(), iter->value()));
-         left -= iter->key().length() + 4 + iter->value().length() + 4;
-       }
+      for (; left > 0 && iter->valid(); iter->next()) {
+       out_omap.insert(make_pair(iter->key(), iter->value()));
+       left -= iter->key().length() + 4 + iter->value().length() + 4;
       }
       if (iter->valid()) {
        cursor.omap_offset = iter->key();