diff -uNr ceph-0.1/src/client/Trace.h ceph-0.1.build/src/client/Trace.h --- ceph-0.1/src/client/Trace.h 2007-12-19 22:34:20.000000000 -0600 +++ ceph-0.1.build/src/client/Trace.h 2019-03-26 14:56:35.814701277 -0500 @@ -16,6 +16,10 @@ #ifndef __CLIENT_TRACE_H #define __CLIENT_TRACE_H +#include +#include +#include + #include #include #include diff -uNr ceph-0.1/src/ebofs/BlockDevice.cc ceph-0.1.build/src/ebofs/BlockDevice.cc --- ceph-0.1/src/ebofs/BlockDevice.cc 2008-01-28 23:53:28.000000000 -0600 +++ ceph-0.1.build/src/ebofs/BlockDevice.cc 2019-03-26 14:55:22.234700999 -0500 @@ -32,7 +32,7 @@ #ifndef __CYGWIN__ #ifndef DARWIN -#include +// #include #endif #endif @@ -160,8 +160,8 @@ // add to biols int nv = bio->bl.buffers().size(); // how many iov's in this bio's bufferlist? - if (num_bio && - num_iovs + nv >= IOV_MAX) break; // to many //g_conf.bdev_iov_max) break; // too many! + //if (num_bio && +// num_iovs + nv >= IOV_MAX) break; // to many //g_conf.bdev_iov_max) break; // too many! num_iovs += nv; start = MIN(start, bio->start); @@ -696,8 +696,8 @@ left -= iov[n].iov_len; n++; - if (left == 0 || - n == IOV_MAX) break; + // if (left == 0 || +// n == IOV_MAX) break; } int r = ::writev(fd, iov, n); diff -uNr ceph-0.1/src/ebofs/BlockDevice.h ceph-0.1.build/src/ebofs/BlockDevice.h --- ceph-0.1/src/ebofs/BlockDevice.h 2008-01-01 17:55:45.000000000 -0600 +++ ceph-0.1.build/src/ebofs/BlockDevice.h 2019-03-26 14:50:27.166699885 -0500 @@ -16,6 +16,10 @@ #ifndef __EBOFS_BLOCKDEVICE_H #define __EBOFS_BLOCKDEVICE_H +#include +#include +#include + using namespace std; #include "include/buffer.h" #include "include/interval_set.h" diff -uNr ceph-0.1/src/include/buffer.h ceph-0.1.build/src/include/buffer.h --- ceph-0.1/src/include/buffer.h 2008-01-28 23:53:41.000000000 -0600 +++ ceph-0.1.build/src/include/buffer.h 2019-03-26 14:55:58.414701136 -0500 @@ -15,6 +15,10 @@ #ifndef __BUFFER_H #define __BUFFER_H +#include +#include +#include + #include #include #include diff -uNr ceph-0.1/src/include/frag.h ceph-0.1.build/src/include/frag.h --- ceph-0.1/src/include/frag.h 2007-12-19 22:34:21.000000000 -0600 +++ ceph-0.1.build/src/include/frag.h 2019-03-26 14:44:47.570698603 -0500 @@ -123,14 +123,14 @@ return frag_t(_enc ^ (1 << (bits()-1))); } bool is_left() const { - return - bits() > 0 && - (value() & (1 << (bits()-1)) == 0); + return 0; + // bits() > 0 && + // (value() & (1 << (bits()-1)) == 0); } bool is_right() const { - return - bits() > 0 && - (value() & (1 << (bits()-1)) == 1); + return 0; + // bits() > 0 && + // (value() & (1 << (bits()-1)) == 1); } frag_t left_child() const { return frag_t(value(), bits()+1); diff -uNr ceph-0.1/src/include/types.h ceph-0.1.build/src/include/types.h --- ceph-0.1/src/include/types.h 2008-01-28 23:53:41.000000000 -0600 +++ ceph-0.1.build/src/include/types.h 2019-03-26 14:26:57.642694563 -0500 @@ -32,6 +32,9 @@ #include #include #include +#include +#include +#include using namespace std; diff -uNr ceph-0.1/src/include/utime.h ceph-0.1.build/src/include/utime.h --- ceph-0.1/src/include/utime.h 2008-01-28 23:53:41.000000000 -0600 +++ ceph-0.1.build/src/include/utime.h 2019-03-26 14:27:47.194694750 -0500 @@ -15,6 +15,10 @@ #ifndef __UTIME_H #define __UTIME_H +#include +#include +#include + #include #include #include diff -uNr ceph-0.1/src/mds/LogEvent.h ceph-0.1.build/src/mds/LogEvent.h --- ceph-0.1/src/mds/LogEvent.h 2007-12-19 22:34:21.000000000 -0600 +++ ceph-0.1.build/src/mds/LogEvent.h 2019-03-26 14:42:45.674698142 -0500 @@ -37,6 +37,9 @@ +#include +#include +#include #include using namespace std; diff -uNr ceph-0.1/src/mds/MDBalancer.cc ceph-0.1.build/src/mds/MDBalancer.cc --- ceph-0.1/src/mds/MDBalancer.cc 2007-12-19 22:34:21.000000000 -0600 +++ ceph-0.1.build/src/mds/MDBalancer.cc 2019-03-26 14:49:08.810699589 -0500 @@ -986,6 +986,8 @@ // recurse, depth-first. if (in->is_dir()) { + string p; + list dirs; in->get_dirfrags(dirs); for (list::iterator p = dirs.begin(); @@ -999,9 +1001,9 @@ myfile << (int)dir->pop_auth_subtree_nested.meta_load(now) << "\t"; // filename last - string p; - in->make_path_string(p); - myfile << "." << p; + // string p; + // in->make_path_string(p); + // myfile << "." << p; if (dir->get_frag() != frag_t()) myfile << "___" << (unsigned)dir->get_frag(); myfile << std::endl; //"/" << dir->get_frag() << dendl; diff -uNr ceph-0.1/src/mon/MDSMonitor.cc ceph-0.1.build/src/mon/MDSMonitor.cc --- ceph-0.1/src/mon/MDSMonitor.cc 2008-01-28 23:53:43.000000000 -0600 +++ ceph-0.1.build/src/mon/MDSMonitor.cc 2019-03-26 14:41:00.398697745 -0500 @@ -392,19 +392,8 @@ return true; } -void MDSMonitor::_updated(int from, MMDSBeacon *m) +void MDSMonitor::_updated(MMDSBeacon *m) { - if (from < 0) { - dout(10) << "_updated (booted) mds" << from << " " << *m << dendl; - mon->osdmon->send_latest(m->get_source_inst()); - } else { - dout(10) << "_updated mds" << from << " " << *m << dendl; - } - if (m->get_state() == MDSMap::STATE_STOPPED) { - // send the map manually (they're out of the map, so they won't get it automatic) - send_latest(m->get_mds_inst()); - } - delete m; } diff -uNr ceph-0.1/src/mon/MDSMonitor.h ceph-0.1.build/src/mon/MDSMonitor.h --- ceph-0.1/src/mon/MDSMonitor.h 2008-01-28 23:53:28.000000000 -0600 +++ ceph-0.1.build/src/mon/MDSMonitor.h 2019-03-26 14:37:34.782696968 -0500 @@ -52,7 +52,7 @@ mm(a), mds(b), m(c) {} void finish(int r) { if (r >= 0) - mm->_updated(mds, m); // success + mm->_updated(m); // success else mm->dispatch((Message*)m); // try again } @@ -65,7 +65,8 @@ void create_pending(); void encode_pending(bufferlist &bl); - void _updated(int m, MMDSBeacon *m); + // void _updated(int m, MMDSBeacon *m); + void _updated(MMDSBeacon *m); bool preprocess_query(Message *m); // true if processed. bool prepare_update(Message *m); diff -uNr ceph-0.1/src/msg/SimpleMessenger.cc ceph-0.1.build/src/msg/SimpleMessenger.cc --- ceph-0.1/src/msg/SimpleMessenger.cc 2008-01-28 23:53:43.000000000 -0600 +++ ceph-0.1.build/src/msg/SimpleMessenger.cc 2019-03-26 15:00:09.070702082 -0500 @@ -1610,15 +1610,15 @@ << " writing " << donow << dendl; - if (msg.msg_iovlen >= IOV_MAX-1) { - if (do_sendmsg(sd, &msg, msglen)) - return -1; + // if (msg.msg_iovlen >= IOV_MAX-1) { + // if (do_sendmsg(sd, &msg, msglen)) +// return -1; - // and restart the iov - msg.msg_iov = msgvec; - msg.msg_iovlen = 0; - msglen = 0; - } + // // and restart the iov + // msg.msg_iov = msgvec; + // msg.msg_iovlen = 0; + // msglen = 0; + // } msgvec[msg.msg_iovlen].iov_base = (void*)(pb->c_str()+b_off); msgvec[msg.msg_iovlen].iov_len = donow;