Merge PR ceph#60236 into main

vshankar · vshankar · commit 2505e27edb04 · 2024-11-04T07:21:38.000+05:30
* refs/pull/60236/head:
	MDS/CDir: return as early as possible from CDir::should_split_fast()

Reviewed-by: Patrick Donnelly &lt;pdonnell@ibm.com&gt;
Reviewed-by: Dhairya Parmar &lt;dparmar@redhat.com&gt;
Reviewed-by: Venky Shankar &lt;vshankar@redhat.com&gt;
diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
@@ -3808,10 +3808,13 @@ bool CDir::should_split_fast() const
     const CDentry *dn = p.second;
     if (!dn->get_projected_linkage()->is_null()) {
       effective_size++;
+
+      if (effective_size > fast_limit) [[unlikely]]
+	return true;
     }
   }
 
-  return effective_size > fast_limit;
+  return false;
 }
 
 bool CDir::should_merge() const

Original file line number	Diff line number	Diff line change
`@@ -3808,10 +3808,13 @@ bool CDir::should_split_fast() const`
`3808`	`3808`	`const CDentry *dn = p.second;`
`3809`	`3809`	`if (!dn->get_projected_linkage()->is_null()) {`
`3810`	`3810`	`effective_size++;`
	`3811`	`+`
	`3812`	`+ if (effective_size > fast_limit) [[unlikely]]`
	`3813`	`+ return true;`
`3811`	`3814`	`}`
`3812`	`3815`	`}`
`3813`	`3816`
`3814`		`- return effective_size > fast_limit;`
	`3817`	`+ return false;`
`3815`	`3818`	`}`
`3816`	`3819`
`3817`	`3820`	`bool CDir::should_merge() const`