From 766528ee9c8d49c2509f68701816695624fe7337 Mon Sep 17 00:00:00 2001 From: Brad Hubbard Date: Tue, 9 May 2017 09:54:30 +1000 Subject: [PATCH] common: Remove redundant includes Fixes: http://tracker.ceph.com/issues/19883 (Partially) Signed-off-by: Brad Hubbard --- src/ceph_ver.c | 1 - src/common/BackTrace.cc | 1 - src/common/LogEntry.cc | 2 +- src/common/PrebufferedStreambuf.h | 1 - src/common/bloom_filter.cc | 11 ++++++----- src/common/bloom_filter.hpp | 1 - src/common/io_priority.cc | 2 -- src/common/perf_histogram.h | 1 - src/common/sctp_crc32.c | 2 -- src/common/utf8.c | 1 - src/include/mempool.h | 4 ---- src/mount/mount.ceph.c | 2 -- src/tools/rbd_nbd/rbd-nbd.cc | 1 + 13 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/ceph_ver.c b/src/ceph_ver.c index b983b5527015d..efa2268185cbe 100644 --- a/src/ceph_ver.c +++ b/src/ceph_ver.c @@ -1,5 +1,4 @@ -#include "acconfig.h" #include "ceph_ver.h" #define CONCAT_VER_SYMBOL(x) ceph_ver__##x diff --git a/src/common/BackTrace.cc b/src/common/BackTrace.cc index 5fc6311d52892..d68f43bd21d7b 100644 --- a/src/common/BackTrace.cc +++ b/src/common/BackTrace.cc @@ -7,7 +7,6 @@ #include "BackTrace.h" #include "common/version.h" -#include "acconfig.h" #define _STR(x) #x #define STRINGIFY(x) _STR(x) diff --git a/src/common/LogEntry.cc b/src/common/LogEntry.cc index ece56951cf553..bc887e1b3ad4d 100644 --- a/src/common/LogEntry.cc +++ b/src/common/LogEntry.cc @@ -1,7 +1,7 @@ #include -#include +#include #include "LogEntry.h" #include "Formatter.h" diff --git a/src/common/PrebufferedStreambuf.h b/src/common/PrebufferedStreambuf.h index 55012d12ea495..d56c9909fe81a 100644 --- a/src/common/PrebufferedStreambuf.h +++ b/src/common/PrebufferedStreambuf.h @@ -1,7 +1,6 @@ #ifndef CEPH_COMMON_PREBUFFEREDSTREAMBUF_H #define CEPH_COMMON_PREBUFFEREDSTREAMBUF_H -#include #include #include diff --git a/src/common/bloom_filter.cc b/src/common/bloom_filter.cc index 5a7a3ac18c3bf..6bc54bc776202 100644 --- a/src/common/bloom_filter.cc +++ b/src/common/bloom_filter.cc @@ -1,8 +1,9 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab -#include "include/types.h" #include "common/bloom_filter.hpp" +#include "common/Formatter.h" +#include "include/buffer.h" MEMPOOL_DEFINE_FACTORY(unsigned char, byte, bloom_filter); @@ -66,7 +67,7 @@ void bloom_filter::dump(Formatter *f) const f->close_section(); } -void bloom_filter::generate_test_instances(list& ls) +void bloom_filter::generate_test_instances(std::list& ls) { ls.push_back(new bloom_filter(10, .5, 1)); ls.push_back(new bloom_filter(10, .5, 1)); @@ -88,7 +89,7 @@ void compressible_bloom_filter::encode(bufferlist& bl) const uint32_t s = size_list.size(); ::encode(s, bl); - for (vector::const_iterator p = size_list.begin(); + for (std::vector::const_iterator p = size_list.begin(); p != size_list.end(); ++p) ::encode((uint64_t)*p, bl); @@ -117,13 +118,13 @@ void compressible_bloom_filter::dump(Formatter *f) const bloom_filter::dump(f); f->open_array_section("table_sizes"); - for (vector::const_iterator p = size_list.begin(); + for (std::vector::const_iterator p = size_list.begin(); p != size_list.end(); ++p) f->dump_unsigned("size", (uint64_t)*p); f->close_section(); } -void compressible_bloom_filter::generate_test_instances(list& ls) +void compressible_bloom_filter::generate_test_instances(std::list& ls) { ls.push_back(new compressible_bloom_filter(10, .5, 1)); ls.push_back(new compressible_bloom_filter(10, .5, 1)); diff --git a/src/common/bloom_filter.hpp b/src/common/bloom_filter.hpp index 286a96589c6b8..9007f111cd709 100644 --- a/src/common/bloom_filter.hpp +++ b/src/common/bloom_filter.hpp @@ -32,7 +32,6 @@ #include "include/mempool.h" #include "include/encoding.h" -#include "common/Formatter.h" static const std::size_t bits_per_char = 0x08; // 8 bits in 1 char(unsigned) static const unsigned char bit_mask[bits_per_char] = { diff --git a/src/common/io_priority.cc b/src/common/io_priority.cc index 579307f407186..687faa3bd7faf 100644 --- a/src/common/io_priority.cc +++ b/src/common/io_priority.cc @@ -12,7 +12,6 @@ * */ -#include #include #ifdef __linux__ #include /* For SYS_xxx definitions */ @@ -20,7 +19,6 @@ #include #include -#include "common/errno.h" #include "io_priority.h" pid_t ceph_gettid(void) diff --git a/src/common/perf_histogram.h b/src/common/perf_histogram.h index bcd51a48ed45f..ee726d394e495 100644 --- a/src/common/perf_histogram.h +++ b/src/common/perf_histogram.h @@ -17,7 +17,6 @@ #include "common/Formatter.h" #include "include/atomic.h" -#include "include/int_types.h" #include #include diff --git a/src/common/sctp_crc32.c b/src/common/sctp_crc32.c index 2fa26afecc5cd..646a401eba603 100644 --- a/src/common/sctp_crc32.c +++ b/src/common/sctp_crc32.c @@ -43,8 +43,6 @@ __FBSDID("$FreeBSD: src/sys/netinet/sctp_crc32.c,v 1.8 2007/05/08 17:01:10 rrs E #include -#include "include/byteorder.h" - #ifndef SCTP_USE_ADLER32 diff --git a/src/common/utf8.c b/src/common/utf8.c index 3bc77c32cded5..5a8592f1cc5e2 100644 --- a/src/common/utf8.c +++ b/src/common/utf8.c @@ -13,7 +13,6 @@ */ #include "common/utf8.h" -#include #include static int high_bits_set(int c) diff --git a/src/include/mempool.h b/src/include/mempool.h index 6753291fc6840..b995905b54584 100644 --- a/src/include/mempool.h +++ b/src/include/mempool.h @@ -14,19 +14,15 @@ #ifndef _CEPH_INCLUDE_MEMPOOL_H #define _CEPH_INCLUDE_MEMPOOL_H -#include -#include #include #include #include #include #include -#include #include #include #include -#include #include #include diff --git a/src/mount/mount.ceph.c b/src/mount/mount.ceph.c index 5ead9313b7d4c..e8fdfcd5496d5 100644 --- a/src/mount/mount.ceph.c +++ b/src/mount/mount.ceph.c @@ -3,8 +3,6 @@ #include #include #include -#include -#include #include "common/module.h" #include "common/secret.h" diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc index 8ba83208b2e0a..ef1f97c91be3d 100644 --- a/src/tools/rbd_nbd/rbd-nbd.cc +++ b/src/tools/rbd_nbd/rbd-nbd.cc @@ -33,6 +33,7 @@ #include #include +#include #include #include "mon/MonClient.h"