Merge pull request ceph#62941 from MaxKellermann/mds_Locker__abort

MaxKellermann · web-flow · commit f7c998cdd0c0 · 2025-04-24T11:12:12.000+02:00
mds/Locker: use ceph_abort_msg() instead of ceph_assert()

Reviewed-by: Venky Shankar &lt;vshankar@redhat.com&gt;
diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
@@ -451,7 +451,7 @@ bool Locker::acquire_locks(const MDRequestRef& mdr,
 	} else if (CDentry *dn = dynamic_cast<CDentry*>(object)) {
 	  dir = dn->get_dir();
 	} else {
-	  ceph_assert(0 == "unknown type of lock parent");
+	  ceph_abort_msg("unknown type of lock parent");
 	}
 	if (dir->get_inode() == mdr->lock_cache->get_dir_inode()) {
 	  // forcibly auth pin if there is lock cache on parent dir

Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ bool Locker::acquire_locks(const MDRequestRef& mdr,`
`451`	`451`	`} else if (CDentry dn = dynamic_cast<CDentry>(object)) {`
`452`	`452`	`dir = dn->get_dir();`
`453`	`453`	`} else {`
`454`		`- ceph_assert(0 == "unknown type of lock parent");`
	`454`	`+ ceph_abort_msg("unknown type of lock parent");`
`455`	`455`	`}`
`456`	`456`	`if (dir->get_inode() == mdr->lock_cache->get_dir_inode()) {`
`457`	`457`	`// forcibly auth pin if there is lock cache on parent dir`