From: wangzhengyong <wangzhengyong@cmss.chinamobile.com>
Date: Fri, 20 Jan 2017 01:25:37 +0000 (+0800)
Subject: os/bluestore: remove no use parameter in bluestore_blob_t::map_bl
X-Git-Tag: v12.0.0~39^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c91adc28ebf3afc2e6972a6a32bf13654ab9ff53;p=ceph.git

os/bluestore: remove no use parameter in bluestore_blob_t::map_bl

Signed-off-by: wangzhengyong <wangzhengyong@cmss.chinamobile.com>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index e8ff586e6c53..0d23a1d11228 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -7691,7 +7691,7 @@ void BlueStore::_do_write_small(
       if (!g_conf->bluestore_debug_omit_block_device_write) {
         b->get_blob().map_bl(
 	  b_off, padded,
-	  [&](uint64_t offset, uint64_t length, bufferlist& t) {
+	  [&](uint64_t offset, bufferlist& t) {
 	    bdev->aio_write(offset, t,
 			    &txc->ioc, wctx->buffered);
 	  });
@@ -8017,7 +8017,7 @@ int BlueStore::_do_alloc_write(
     if (!g_conf->bluestore_debug_omit_block_device_write) {
       b->get_blob().map_bl(
         b_off, *l,
-        [&](uint64_t offset, uint64_t length, bufferlist& t) {
+        [&](uint64_t offset, bufferlist& t) {
   	  bdev->aio_write(offset, t, &txc->ioc, false);
         });
     }
diff --git a/src/os/bluestore/bluestore_types.h b/src/os/bluestore/bluestore_types.h
index 20cda85d0528..6d4392f6a6dc 100644
--- a/src/os/bluestore/bluestore_types.h
+++ b/src/os/bluestore/bluestore_types.h
@@ -527,7 +527,7 @@ struct bluestore_blob_t {
   }
   void map_bl(uint64_t x_off,
 	      bufferlist& bl,
-	      std::function<void(uint64_t,uint64_t,bufferlist&)> f) const {
+	      std::function<void(uint64_t,bufferlist&)> f) const {
     auto p = extents.begin();
     assert(p != extents.end());
     while (x_off >= p->length) {
@@ -542,7 +542,7 @@ struct bluestore_blob_t {
       uint64_t l = MIN(p->length - x_off, x_len);
       bufferlist t;
       it.copy(l, t);
-      f(p->offset + x_off, l, t);
+      f(p->offset + x_off, t);
       x_off = 0;
       x_len -= l;
       ++p;