From 3299b018af36a7f65c8024794d0e15688b6b62df Mon Sep 17 00:00:00 2001
From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Thu, 21 Apr 2016 13:56:31 +0800
Subject: [PATCH] crush: use bucket_exists() for item sanity checks

This is because get_bucket() never returns 0 on error,
it always returns a non-zero value. So if you
assert(get_bucket(item)), you always get a postive answer.

Replace existence check for a specific item

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---
 src/crush/CrushWrapper.cc | 2 +-
 src/crush/CrushWrapper.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index dc6280ee8507e..16f61dfb7467c 100644
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -471,8 +471,8 @@ bool CrushWrapper::check_item_loc(CephContext *cct, int item, const map<string,s
       return false;
     }
 
+    assert(bucket_exists(id));
     crush_bucket *b = get_bucket(id);
-    assert(b);
 
     // see if item exists in this bucket
     for (unsigned j=0; j<b->size; j++) {
diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h
index 411b2b53364d1..f926ffeed3c2f 100644
--- a/src/crush/CrushWrapper.h
+++ b/src/crush/CrushWrapper.h
@@ -905,7 +905,7 @@ private:
       return (-EINVAL);
 
     // check that the bucket that we want to detach exists
-    assert( get_bucket(item) );
+    assert(bucket_exists(item));
 
     // get the bucket's weight
     crush_bucket *b = get_bucket(item);
-- 
2.39.5