From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 23 Apr 2014 14:09:28 +0000 (+0200)
Subject: SimpleLock.h: fix bool comparison using relational operator
X-Git-Tag: v0.81~76^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=022e705f87bf58c02051959f87ac953a3376ccf7;p=ceph.git

SimpleLock.h: fix bool comparison using relational operator

[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>
---

diff --git a/src/mds/SimpleLock.h b/src/mds/SimpleLock.h
index cbaa9964e1be..2cfc99997ddf 100644
--- a/src/mds/SimpleLock.h
+++ b/src/mds/SimpleLock.h
@@ -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) {