From: Willem Jan Withagen <wjw@digiware.nl>
Date: Thu, 1 Jul 2021 16:08:20 +0000 (+0200)
Subject: blk/kernel: reorganise and use fd in debug
X-Git-Tag: v17.1.0~1459^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5cd281a19650e4ce0e2909c52ca782f93ba8423b;p=ceph.git

blk/kernel: reorganise and use fd in debug

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
---

diff --git a/src/blk/kernel/KernelDevice.cc b/src/blk/kernel/KernelDevice.cc
index 239d700e212b..0592f571b8f4 100644
--- a/src/blk/kernel/KernelDevice.cc
+++ b/src/blk/kernel/KernelDevice.cc
@@ -87,11 +87,11 @@ KernelDevice::KernelDevice(CephContext* cct, aio_callback_t cb, void *cbpriv, ai
 
 int KernelDevice::_lock()
 {
-  dout(10) << __func__ << " " << fd_directs[WRITE_LIFE_NOT_SET] << dendl;
   // When the block changes, systemd-udevd will open the block,
   // read some information and close it. Then a failure occurs here.
   // So we need to try again here.
   int fd = fd_directs[WRITE_LIFE_NOT_SET];
+  dout(10) << __func__ << " fd=" << fd << dendl;
   uint64_t nr_tries = 0;
   for (;;) {
     struct flock fl = { .l_type = F_WRLCK,