Merge remote-tracking branch 'origin/6.0/stage'

pcd1193182 · Jun 6, 2022 · ac47650 · ac47650
2 parents b9309f7 + a5fb50f
commit ac47650
Show file tree

Hide file tree

Showing 24 changed files with 619 additions and 529 deletions.
diff --git a/cmd/zfs_object_agent/.cargo/config.toml b/cmd/zfs_object_agent/.cargo/config.toml
@@ -9,3 +9,9 @@ rustflags = [
     "-Dclippy::dbg_macro",
 ]
 
+# include frame pointers so that we get a little bit of stack trace for
+# flame graphs (without full dwarf unwinding)
+[target.x86_64-unknown-linux-gnu]
+rustflags = [
+    "-C", "force-frame-pointers=yes",
+]
diff --git a/cmd/zfs_object_agent/Cargo.lock b/cmd/zfs_object_agent/Cargo.lock