Add back filesystem type dimensions to benchmarks.

Fixes a933719841 ("Add FUSE dimension to gvisor macrobenchmarks.").

PiperOrigin-RevId: 534591592

test/benchmarks/fs/fsbench/fsbench.go

@@ -64,7 +64,7 @@ type Variant struct {
 // TypicalVariants returns the typical full set of benchmark variants.
 func TypicalVariants() []Variant {
 	variants := make([]Variant, 0, 8)
-	for _, filesys := range []harness.FileSystemType{harness.FuseFS} {
+	for _, filesys := range []harness.FileSystemType{harness.BindFS, harness.TmpFS, harness.RootFS, harness.FuseFS} {
 		variants = append(variants, Variant{
 			clearCache: true,
 			fsType:     filesys,

test/benchmarks/harness/util.go

@@ -110,16 +110,15 @@ func MakeMount(machine Machine, fsType FileSystemType, cu *cleanup.Cleanup) ([]m
 		})
 		return mounts, target, nil
 	case FuseFS:
-		mounts = append(mounts, []mount.Mount{
-			{
+		mounts = append(mounts,
+			mount.Mount{
 				Target: target,
 				Type:   mount.TypeTmpfs,
 			},
-			{
+			mount.Mount{
 				Target: "/fuse",
 				Type:   mount.TypeTmpfs,
-			},
-		}...)
+			})
 		return mounts, target, nil
 	default:
 		return mounts, "", fmt.Errorf("illegal mount type not supported: %v", fsType)