From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 10 Jan 2017 07:46:32 +0000 (+0800)
Subject: os/bluestore/NVMeDevice: kill zeros
X-Git-Tag: v12.0.0~240^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e353d8e0b10f7d9fb240a34d770ecbd87db691d8;p=ceph-ci.git

os/bluestore/NVMeDevice: kill zeros

See https://github.com/ceph/ceph/commit/2cd63d2209aaa0221a3f0a69b3f49ab1e01d9e20
The aio_zero() interface is deprecated.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/os/bluestore/NVMEDevice.cc b/src/os/bluestore/NVMEDevice.cc
index 2413d63f360..3f5dec9b508 100644
--- a/src/os/bluestore/NVMEDevice.cc
+++ b/src/os/bluestore/NVMEDevice.cc
@@ -182,7 +182,6 @@ class SharedDriverData {
   std::set<uint64_t> flush_waiter_seqs;
 
  public:
-  bool zero_command_support;
   std::atomic_ulong completed_op_seq, queue_op_seq;
   PerfCounters *logger = nullptr;
 
@@ -202,7 +201,6 @@ class SharedDriverData {
     sector_size = spdk_nvme_ns_get_sector_size(ns);
     block_size = std::max(CEPH_PAGE_SIZE, sector_size);
     size = ((uint64_t)sector_size) * spdk_nvme_ns_get_num_sectors(ns);
-    zero_command_support = spdk_nvme_ns_get_flags(ns) & SPDK_NVME_NS_WRITE_ZEROES_SUPPORTED;
     qpair = spdk_nvme_ctrlr_alloc_io_qpair(c, SPDK_NVME_QPRIO_URGENT);
 
     PerfCountersBuilder b(g_ceph_context, string("NVMEDevice-AIOThread-"+stringify(this)),
@@ -811,10 +809,6 @@ int NVMEDevice::open(string p)
   driver->register_device(this);
   block_size = driver->get_block_size();
   size = driver->get_size();
-  if (!driver->zero_command_support) {
-    zeros = buffer::create_page_aligned(1048576);
-    zeros.zero();
-  }
 
   //nvme is non-rotational device.
   rotational = false;
diff --git a/src/os/bluestore/NVMEDevice.h b/src/os/bluestore/NVMEDevice.h
index 5f44738f8b0..f6cfd59e96d 100644
--- a/src/os/bluestore/NVMEDevice.h
+++ b/src/os/bluestore/NVMEDevice.h
@@ -54,7 +54,6 @@ class NVMEDevice : public BlockDevice {
   uint64_t block_size;
 
   bool aio_stop;
-  bufferptr zeros;
 
   struct BufferedExtents {
     struct Extent {