]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
blk/kernel: use uint64_t for bdev_flock_retry
authorKefu Chai <kchai@redhat.com>
Mon, 21 Sep 2020 12:01:25 +0000 (20:01 +0800)
committerNathan Cutler <ncutler@suse.com>
Tue, 27 Oct 2020 10:29:30 +0000 (11:29 +0100)
commit31281dcf29596c7c363687ee2f20b48a8250e403
tree013536a8bfd84d96971db8222b7c5f8780667082
parent21fe507e70dc4b7caa8ea36f53b246ae36dc71e0
blk/kernel: use uint64_t for bdev_flock_retry

also drop bdev_flock_retry and bdev_flock_retry_interval from
legacy_config_opts.h, as `KernelDevice::_lock()` is not in the critical
path, there is no need to access these settings via member variables --
get_val<> would just suffice.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 8fb80db9ff32a85fcdf91e38075c42165805e37f)

Conflicts:
src/blk/kernel/KernelDevice.cc
- file does not exist in nautilus; changes applied without conflicts to
  src/os/bluestore/KernelDevice.cc
src/common/legacy_config_opts.h
src/common/options.cc
src/os/bluestore/KernelDevice.cc