missing parens

diff --git a/src/ebofs/Ebofs.h b/src/ebofs/Ebofs.h
index a387b65428e726b736d156c8e74c9be393c70e22..41f8244d3337d41d0fa94f734cee07a67b8fde7b 100644 (file)
--- a/src/ebofs/Ebofs.h
+++ b/src/ebofs/Ebofs.h
@@ -13,12 +13,6 @@
  */
 
 
-#include <map>
-using namespace std;
-
-#include <ext/hash_map>
-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 bd48a0e966b5e1d9455159b1dd9cc62eace82d77..ffb9480720a03817ffd83f3bf0db82b73b6e56a2 100644 (file)
--- a/src/ebofs/Onode.h
+++ b/src/ebofs/Onode.h
@@ -355,7 +355,7 @@ public:
 
     map<block_t,ExtentCsum>::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 5c8c487e290efc84426169de6ea5e6f55cbca1e7..063e564bf0ce0d4bcfa0f72796b3c03e5887433b 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -451,7 +451,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 e8b06e62f078e59646b76a162e301f681e7253e5..b08ad7187e4ce2f7fa9fa5a45985005d39e7057d 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -415,7 +415,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;