Merge pull request #8212 from yehudasa/wip-15181

cls/rgw: fix use of timespan

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-03-18 13:41:28 -04:00
commit f0c19a2691

View File

@ -2944,7 +2944,7 @@ static int gc_update_entry(cls_method_context_t hctx, uint32_t expiration_secs,
}
}
info.time = ceph::real_clock::now();
info.time += timespan(expiration_secs);
info.time += make_timespan(expiration_secs);
ret = gc_omap_set(hctx, GC_OBJ_NAME_INDEX, info.tag, &info);
if (ret < 0)
return ret;