]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
BlueStore: kill warnings
authorxie xingguo <xie.xingguo@zte.com.cn>
Thu, 14 Jan 2016 06:43:59 +0000 (14:43 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Thu, 14 Jan 2016 06:43:59 +0000 (14:43 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/os/bluestore/BlueFS.cc
src/os/bluestore/BlueStore.cc
src/os/kstore/KStore.cc

index e2d41ba937d3bf930ecdaad482d8268f8a346f2d..ee4711b66e8a5922004f38d8f86276600c88c208 100644 (file)
@@ -705,7 +705,7 @@ int BlueFS::_read(
     left = buf->get_buf_remaining(off);
     dout(20) << __func__ << " left " << left << " len " << len << dendl;
 
-    int r = MIN(len, left);
+    int r = MIN((int)len, left);
     if (outbl) {
       bufferlist t;
       t.substr_of(buf->bl, off - buf->bl_off, r);
index 8c0b71637baf553ec13a3a19f09800122e1b01e2..d51a1c0ebf83463e8c1d035c35494b2c15f4af79 100644 (file)
@@ -4054,7 +4054,6 @@ int BlueStore::_txc_add_transaction(TransContext *txc, Transaction *t)
 
     case Transaction::OP_COLL_HINT:
       {
-        coll_t cid = i.get_cid(op->cid);
         uint32_t type = op->hint_type;
         bufferlist hint;
         i.decode_bl(hint);
index 9490751f72d9d9311595738384d23833fdd57bdd..bb4305a71edf46d117ae2ed73df2add224135204 100644 (file)
@@ -2589,7 +2589,6 @@ int KStore::_txc_add_transaction(TransContext *txc, Transaction *t)
 
     case Transaction::OP_COLL_HINT:
       {
-        coll_t cid = i.get_cid(op->cid);
         uint32_t type = op->hint_type;
         bufferlist hint;
         i.decode_bl(hint);