Merge pull request #17512 from tchaikov/wip-chmod-x

common,mon,osd,pybind: silence warning and remove executable mode bit Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
ceph · Sep 9, 2017 · d40250d · d40250d
2 parents de77a93 + 22d1aac
commit d40250d
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 4 deletions.
diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
diff --git a/src/include/interval_set.h b/src/include/interval_set.h
@@ -239,17 +239,14 @@ class interval_set {
   void intersection_size_asym(const interval_set &s, const interval_set &l) {
     typename decltype(m)::const_iterator ps = s.m.begin(), pl;
     assert(ps != s.m.end());
-    T offset = ps->first, prev_offset;
+    T offset = ps->first;
     bool first = true;
     typename decltype(m)::iterator mi = m.begin();
 
     while (1) {
       if (first)
         first = false;
-      else
-        assert(offset > prev_offset);
       pl = l.find_inc(offset);
-      prev_offset = offset;
       if (pl == l.m.end())
         break;
       while (ps != s.m.end() && ps->first + ps->second <= pl->first)

diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
diff --git a/src/os/kstore/KStore.cc b/src/os/kstore/KStore.cc
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
diff --git a/src/osd/PG.h b/src/osd/PG.h
diff --git a/src/pybind/ceph_daemon.py b/src/pybind/ceph_daemon.py
diff --git a/src/pybind/ceph_rest_api.py b/src/pybind/ceph_rest_api.py
diff --git a/src/test/librados/tier.cc b/src/test/librados/tier.cc