zfs changes fixup

platformtest/tests/helpers.go

@@ -157,7 +157,7 @@ func versionRelnamesSorted(versions []zfs.FilesystemVersion) []string {
 	for _, v := range versions {
 		vstrs = append(vstrs, v.RelName())
 	}
-	sort.Sort(sort.StringSlice(vstrs))
+	sort.Strings(vstrs)
 	return vstrs
 }
 
@@ -171,6 +171,6 @@ func datasetToStringSortedTrimPrefix(prefix *zfs.DatasetPath, paths []*zfs.Datas
 		}
 		pstrs = append(pstrs, trimmed.ToString())
 	}
-	sort.Sort(sort.StringSlice(pstrs))
+	sort.Strings(pstrs)
 	return pstrs
 }

zfs/versions.go

@@ -37,7 +37,7 @@ var (
 
 func (s VersionTypeSet) zfsListTFlagRepr() string {
 	var types []string
-	for t, _ := range s {
+	for t := range s {
 		types = append(types, t.String())
 	}
 	return strings.Join(types, ",")

zfs/zfs.go

@@ -1086,18 +1086,15 @@ func ZFSRecv(ctx context.Context, fs string, v *ZFSSendArgVersion, streamCopier
 	if opts.RollbackAndForceRecv {
 		// destroy all snapshots before `recv -F` because `recv -F`
 		// does not perform a rollback unless `send -R` was used (which we assume hasn't been the case)
-		var snaps []FilesystemVersion
+		snaps, err := ZFSListFilesystemVersions(fsdp, ListFilesystemVersionsOptions{
-		{
+			Types: Snapshots,
-			snaps, err := ZFSListFilesystemVersions(fsdp, ListFilesystemVersionsOptions{
+		})
-				Types: Snapshots,
+		if err != nil {
-			})
+			return fmt.Errorf("cannot list versions for rollback for forced receive: %s", err)
-			if err != nil {
-				return fmt.Errorf("cannot list versions for rollback for forced receive: %s", err)
-			}
-			sort.Slice(snaps, func(i, j int) bool {
-				return snaps[i].CreateTXG < snaps[j].CreateTXG
-			})
 		}
+		sort.Slice(snaps, func(i, j int) bool {
+			return snaps[i].CreateTXG < snaps[j].CreateTXG
+		})
 		// bookmarks are rolled back automatically
 		if len(snaps) > 0 {
 			// use rollback to efficiently destroy all but the earliest snapshot