Merge remote-tracking branch 'calmh/master' into p1

utils.go

@@ -266,8 +266,13 @@ func parseInodeChanges(lines [][]string) ([]*InodeChange, error) {
 	return changes, nil
 }
 
-func listByType(t, filter string) ([]*Dataset, error) {
-	args := []string{"get", "-rHp", "-t", t, "all"}
+func listByType(t, filter string, depth int) ([]*Dataset, error) {
+	var args []string
+	if depth > 0 {
+		args = []string{"get", fmt.Sprintf("-d%d", depth), "-rHp", "-t", t, "all"}
+	} else {
+		args = []string{"get", "-rHp", "-t", t, "all"}
+	}
 	if filter != "" {
 		args = append(args, filter)
 	}

zfs.go

@@ -117,29 +117,29 @@ func zfs(arg ...string) ([][]string, error) {
 // Datasets returns a slice of ZFS datasets, regardless of type.
 // A filter argument may be passed to select a dataset with the matching name,
 // or empty string ("") may be used to select all datasets.
-func Datasets(filter string) ([]*Dataset, error) {
-	return listByType("all", filter)
+func Datasets(filter string, depth int) ([]*Dataset, error) {
+	return listByType("all", filter, depth)
 }
 
 // Snapshots returns a slice of ZFS snapshots.
 // A filter argument may be passed to select a snapshot with the matching name,
 // or empty string ("") may be used to select all snapshots.
-func Snapshots(filter string) ([]*Dataset, error) {
-	return listByType(DatasetSnapshot, filter)
+func Snapshots(filter string, depth int) ([]*Dataset, error) {
+	return listByType(DatasetSnapshot, filter, depth)
 }
 
 // Filesystems returns a slice of ZFS filesystems.
 // A filter argument may be passed to select a filesystem with the matching name,
 // or empty string ("") may be used to select all filesystems.
-func Filesystems(filter string) ([]*Dataset, error) {
-	return listByType(DatasetFilesystem, filter)
+func Filesystems(filter string, depth int) ([]*Dataset, error) {
+	return listByType(DatasetFilesystem, filter, depth)
 }
 
 // Volumes returns a slice of ZFS volumes.
 // A filter argument may be passed to select a volume with the matching name,
 // or empty string ("") may be used to select all volumes.
-func Volumes(filter string) ([]*Dataset, error) {
-	return listByType(DatasetVolume, filter)
+func Volumes(filter string, depth int) ([]*Dataset, error) {
+	return listByType(DatasetVolume, filter, depth)
 }
 
 // GetDataset retrieves a single ZFS dataset by name.  This dataset could be
@@ -336,7 +336,7 @@ func (d *Dataset) Rename(name string, createParent bool, recursiveRenameSnapshot
 
 // Snapshots returns a slice of all ZFS snapshots of a given dataset.
 func (d *Dataset) Snapshots() ([]*Dataset, error) {
-	return Snapshots(d.Name)
+	return Snapshots(d.Name, 1)
 }
 
 // CreateFilesystem creates a new ZFS filesystem with the specified name and

zpool.go

@@ -49,13 +49,13 @@ func GetZpool(name string) (*Zpool, error) {
 }
 
 // Datasets returns a slice of all ZFS datasets in a zpool.
-func (z *Zpool) Datasets() ([]*Dataset, error) {
-	return Datasets(z.Name)
+func (z *Zpool) Datasets(depth int) ([]*Dataset, error) {
+	return Datasets(z.Name, depth)
 }
 
 // Snapshots returns a slice of all ZFS snapshots in a zpool.
-func (z *Zpool) Snapshots() ([]*Dataset, error) {
-	return Snapshots(z.Name)
+func (z *Zpool) Snapshots(depth int) ([]*Dataset, error) {
+	return Snapshots(z.Name, depth)
 }
 
 // CreateZpool creates a new ZFS zpool with the specified name, properties,