]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
SimpleLock.h: fix bool comparison using relational operator
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Wed, 23 Apr 2014 14:09:28 +0000 (16:09 +0200)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Wed, 30 Apr 2014 20:51:43 +0000 (22:51 +0200)
[src/mds/SimpleLock.h:287]: (warning) Comparison of a boolean value
 using relational operator (<, >, <= or >=).

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
src/mds/SimpleLock.h

index cbaa9964e1be2e57eb3a30eba189ec6fc143bee0..2cfc99997ddf357c49f0e9ede79b816892e621b3 100644 (file)
@@ -284,8 +284,8 @@ public:
   struct ptr_lt {
     bool operator()(const SimpleLock* l, const SimpleLock* r) const {
       // first sort by object type (dn < inode)
-      if ((l->type->type>CEPH_LOCK_DN) <  (r->type->type>CEPH_LOCK_DN)) return true;
-      if ((l->type->type>CEPH_LOCK_DN) == (r->type->type>CEPH_LOCK_DN)) {
+      if (!(l->type->type > CEPH_LOCK_DN) && (r->type->type > CEPH_LOCK_DN)) return true;
+      if ((l->type->type > CEPH_LOCK_DN) == (r->type->type > CEPH_LOCK_DN)) {
        // then sort by object
        if (l->parent->is_lt(r->parent)) return true;
        if (l->parent == r->parent) {