From: Kefu Chai <kchai@redhat.com>
Date: Thu, 3 Sep 2020 03:03:02 +0000 (+0800)
Subject: Merge pull request #36775 from tchaikov/wip-spdk
X-Git-Tag: wip-pdonnell-testing-20200918.022351~167
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=968df0cae65509a7334514302cb61bb4d1752e60;p=ceph-ci.git

Merge pull request #36775 from tchaikov/wip-spdk

spdk: pick up spdk v20.07

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

968df0cae65509a7334514302cb61bb4d1752e60
diff --cc src/common/legacy_config_opts.h
index cc60a1fe742,a73031f8017..ea16bc85cd7
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@@ -895,11 -895,8 +895,10 @@@ OPTION(bdev_debug_aio_log_age, OPT_DOUB
  // to the uio_pci_generic driver. The purpose is to prevent the case where
  // NVMe driver is loaded while osd is running.
  OPTION(bdev_nvme_unbind_from_kernel, OPT_BOOL)
- OPTION(bdev_nvme_retry_count, OPT_INT) // -1 means by default which is 4
  OPTION(bdev_enable_discard, OPT_BOOL)
  OPTION(bdev_async_discard, OPT_BOOL)
 +OPTION(bdev_flock_retry_interval, OPT_FLOAT)
 +OPTION(bdev_flock_retry, OPT_INT)
  
  OPTION(objectstore_blackhole, OPT_BOOL)