Merge pull request openzfs#614 from delphix/projects/merge-upstream/m…

…aster Merge remote-tracking branch '6.0/stage' into 'master'
pcd1193182 · Sep 15, 2022 · 7efe4e9 · 7efe4e9
2 parents d2f8fb6 + d2bce70
commit 7efe4e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/zfs_object_agent/zettacache/src/zettacache/mod.rs b/cmd/zfs_object_agent/zettacache/src/zettacache/mod.rs
@@ -689,7 +689,7 @@ impl Inner {
 
         let mut sysinfo = System::new();
         sysinfo.refresh_system();
-        let system_memory = usize::from64(sysinfo.total_memory() * 1024);
+        let system_memory = usize::from64(sysinfo.total_memory());
 
         // Calculate a maximum size for the pending_changes as a percentage of system memory
         // Note that during a merge, this space must also accomodate the space used by

diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib
@@ -1305,7 +1305,7 @@ function is_shared_smb
 	datasetexists "$fs" || return
 
 	if is_linux; then
-		net usershare list | grep -xFq "${fs//\//_}"
+		net usershare list | grep -xFq "${fs//[-\/]/_}"
 	else
 		log_note "SMB on $UNAME currently unsupported by the test framework"
 		return 1