import quincy beta 17.1.0

[ceph.git] / ceph / src / cls / rbd / cls_rbd_types.h

diff --git a/ceph/src/cls/rbd/cls_rbd_types.h b/ceph/src/cls/rbd/cls_rbd_types.h
index 3e7ca77fa87c04ade9029a508009a0bf9b342b24..645861b2d8fd70353e1a743783ba9fc6605a99fb 100644 (file)
--- a/ceph/src/cls/rbd/cls_rbd_types.h
+++ b/ceph/src/cls/rbd/cls_rbd_types.h
@@ -475,14 +475,13 @@ struct GroupSnapshotNamespace {
   }
 
   inline bool operator<(const GroupSnapshotNamespace& gsn) const {
-    if (group_pool < gsn.group_pool) {
-      return true;
-    } else if (group_id < gsn.group_id) {
-      return true;
-    } else {
-      return (group_snapshot_id < gsn.group_snapshot_id);
+    if (group_pool != gsn.group_pool) {
+      return group_pool < gsn.group_pool;
     }
-    return false;
+    if (group_id != gsn.group_id) {
+      return group_id < gsn.group_id;
+    }
+    return group_snapshot_id < gsn.group_snapshot_id;
   }
 };