From 247281bff6e4095857560c5fd675e7a5df0be285 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 23 Jul 2008 09:16:13 -0700 Subject: [PATCH] missing parens --- src/ebofs/Ebofs.h | 6 ------ src/ebofs/Onode.h | 4 ++-- src/mds/Server.cc | 2 +- src/osdc/Objecter.cc | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/ebofs/Ebofs.h b/src/ebofs/Ebofs.h index 945487ece4884..456c2574ff6f2 100644 --- a/src/ebofs/Ebofs.h +++ b/src/ebofs/Ebofs.h @@ -13,12 +13,6 @@ */ -#include -using namespace std; - -#include -using namespace __gnu_cxx; - #include "include/Context.h" #include "include/buffer.h" #include "include/hash.h" diff --git a/src/ebofs/Onode.h b/src/ebofs/Onode.h index bd48a0e966b5e..ffb9480720a03 100644 --- a/src/ebofs/Onode.h +++ b/src/ebofs/Onode.h @@ -355,7 +355,7 @@ public: map::iterator p = extent_map.lower_bound(len); if (p != extent_map.begin() && - (p == extent_map.end() || p->first > len && p->first)) { + (p == extent_map.end() ||( p->first > len && p->first))) { p--; ExtentCsum &o = p->second; if (o.ex.length > len - p->first) { @@ -422,7 +422,7 @@ public: } if (p != extent_map.begin() && - (p == extent_map.end() || p->first > start && p->first)) { + (p == extent_map.end() || (p->first > start && p->first))) { p--; if (p->second.ex.length > start - p->first) { extent_t ex; diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 5d2faf3979387..e3319b638a848 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -448,7 +448,7 @@ void Server::process_reconnected_caps() } } else { // note that client should perform stale/reap cleanup during reconnect. - assert(issued & (CEPH_CAP_WR|CEPH_CAP_WRBUFFER) == 0); // ???? + assert((issued & (CEPH_CAP_WR|CEPH_CAP_WRBUFFER)) == 0); // ???? if (in->filelock.is_xlocked()) in->filelock.set_state(LOCK_LOCK); else diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index a432677acc053..acba49f2d3734 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -414,7 +414,7 @@ void Objecter::handle_osd_stat_reply(MOSDOpReply *m) // success? if (m->get_result() == -EINCLOCKED && - st->flags & CEPH_OSD_OP_INCLOCK_FAIL == 0) { + (st->flags & CEPH_OSD_OP_INCLOCK_FAIL) == 0) { dout(7) << " got -EINCLOCKED, resubmitting" << dendl; stat_submit(st); delete m; -- 2.39.5