From: weixinwei <xinweiwei90@gmail.com>
Date: Fri, 29 May 2020 14:43:31 +0000 (+0800)
Subject: blk:BlockDevice.cc: use pending_aios instead of iovec size as ios num
X-Git-Tag: v14.2.14~9^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F37823%2Fhead;p=ceph.git

blk:BlockDevice.cc: use pending_aios instead of iovec size as ios num

Signed-off-by: weixinwei <xinweiwei90@gmail.com>
(cherry picked from commit 64ce414b022b96b7a5c73d2c03393a877b30e508)

Conflicts:
	src/blk/BlockDevice.cc
- file does not exist in Nautilus; made the changes manually in
  src/os/bluestore/BlockDevice.cc
---

diff --git a/src/os/bluestore/BlockDevice.cc b/src/os/bluestore/BlockDevice.cc
index bba9a96cd6808..edfc2fb9c8453 100644
--- a/src/os/bluestore/BlockDevice.cc
+++ b/src/os/bluestore/BlockDevice.cc
@@ -64,9 +64,7 @@ uint64_t IOContext::get_num_ios() const
   // that to the bytes value.
   uint64_t ios = 0;
 #if defined(HAVE_LIBAIO) || defined(HAVE_POSIXAIO)
-  for (auto& p : pending_aios) {
-    ios += p.iov.size();
-  }
+  ios += pending_aios.size();
 #endif
 #ifdef HAVE_SPDK
   ios += total_nseg;