From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 9 Jun 2016 19:59:35 +0000 (-0700)
Subject: cls/rgw: fix timespan comparison
X-Git-Tag: v10.2.3~112^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bdef8b23714eaff933992ed8c02fb35cd8d11818;p=ceph.git

cls/rgw: fix timespan comparison

Fixes: http://tracker.ceph.com/issues/16220

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit e0a07f70f7740a66ffa2646e0a57e8bdc0285373)
---

diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc
index a29ad7bf03ac..146da9c55a6d 100644
--- a/src/cls/rgw/cls_rgw.cc
+++ b/src/cls/rgw/cls_rgw.cc
@@ -1912,7 +1912,7 @@ int rgw_dir_suggest_changes(cls_method_context_t hctx, bufferlist *in, bufferlis
                 cur_disk.pending_map.begin();
       while(iter != cur_disk.pending_map.end()) {
         map<string, struct rgw_bucket_pending_info>::iterator cur_iter=iter++;
-        if (cur_time > (cur_iter->second.timestamp + tag_timeout)) {
+        if (cur_time > (cur_iter->second.timestamp + timespan(tag_timeout))) {
           cur_disk.pending_map.erase(cur_iter);
         }
       }