SQUASH THIS MERGE branch 'problame/zfs-command-logging-and-status' into problame/holds-release-and-hold-leak-fix-v2

2020-03-27 17:14:12 +01:00
parent 47d7bba192 4e13ea46de
commit 586a4ffac8
40 changed files with 633 additions and 228 deletions
@@ -204,8 +204,8 @@ func ZFSListFilesystemVersions(fs *DatasetPath, filter FilesystemVersionFilter)
 	return
 }

-func ZFSGetFilesystemVersion(ds string) (v FilesystemVersion, _ error) {
-	props, err := zfsGet(ds, []string{"createtxg", "guid", "creation"}, sourceAny)
+func ZFSGetFilesystemVersion(ctx context.Context, ds string) (v FilesystemVersion, _ error) {
+	props, err := zfsGet(ctx, ds, []string{"createtxg", "guid", "creation"}, sourceAny)
 	if err != nil {
 		return v, err
 	}