update ceph source to reef 18.2.1

[ceph.git] / ceph / src / mds / SimpleLock.cc

diff --git a/ceph/src/mds/SimpleLock.cc b/ceph/src/mds/SimpleLock.cc
index 76448ee9db2a8cbbc37d80f4a1e44805ab2eef7a..b23915f945219bbbe17c278ffb108547df301cd7 100644 (file)
--- a/ceph/src/mds/SimpleLock.cc
+++ b/ceph/src/mds/SimpleLock.cc
@@ -31,13 +31,14 @@ void SimpleLock::dump(ceph::Formatter *f) const {
   f->close_section();
 
   f->dump_string("state", get_state_name(get_state()));
+  f->dump_string("type", get_lock_type_name(get_type()));
   f->dump_bool("is_leased", is_leased());
   f->dump_int("num_rdlocks", get_num_rdlocks());
   f->dump_int("num_wrlocks", get_num_wrlocks());
   f->dump_int("num_xlocks", get_num_xlocks());
   f->open_object_section("xlock_by");
-  if (get_xlock_by()) {
-    get_xlock_by()->dump(f);
+  if (auto mut = get_xlock_by(); mut) {
+    f->dump_object("reqid", mut->reqid);
   }
   f->close_section();
 }