From: Loic Dachary <loic@dachary.org>
Date: Tue, 24 Sep 2013 17:04:23 +0000 (+0200)
Subject: osd: change warn_interval_multiplier to uint32_t
X-Git-Tag: mark-v0.70-wip~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f6510c766592dbfa518e8667ed4d852d7e9319c0;p=ceph.git

osd: change warn_interval_multiplier to uint32_t

to prevent overflow in OpTracker::check_ops_in_flight when
multiplying warn_interval_multiplier *= 2

Backport: cuttlefish, dumpling

http://tracker.ceph.com/issues/6370 fixes #6370

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 1bce1f009bffd3e28025a08775fec189907a81db)
---

diff --git a/src/osd/OpRequest.h b/src/osd/OpRequest.h
index fc8a8ab82c944..f4cc78553011c 100644
--- a/src/osd/OpRequest.h
+++ b/src/osd/OpRequest.h
@@ -128,7 +128,7 @@ struct OpRequest : public TrackedOp {
   void set_pg_op() { rmw_flags |= CEPH_OSD_RMW_FLAG_PGOP; }
 
   utime_t received_time;
-  uint8_t warn_interval_multiplier;
+  uint32_t warn_interval_multiplier;
   utime_t get_arrived() const {
     return received_time;
   }