From 6168946ef7c2a338c4d9aeb61ad077a839c0ca0a Mon Sep 17 00:00:00 2001
From: Denis Shaposhnikov <993498+dsh2dsh@users.noreply.github.com>
Date: Sun, 24 Nov 2024 16:03:21 +0100
Subject: [PATCH] One more fix after commit 184b850

See prev commit for details.
---
 internal/endpoint/endpoint.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/internal/endpoint/endpoint.go b/internal/endpoint/endpoint.go
index bf370d7..e4467d9 100644
--- a/internal/endpoint/endpoint.go
+++ b/internal/endpoint/endpoint.go
@@ -718,7 +718,7 @@ func listFilesystemsRecursive(ctx context.Context, root *zfs.DatasetPath,
 			return cmp.Compare(a.Order(), b.Order())
 		})
 
-	fss, err := makeFilesystems(ctx, root, sortedProps)
+	fss, err := makeFilesystems(ctx, root, includingRoot, sortedProps)
 	if err != nil {
 		return nil, err
 	} else if len(fss) == 0 {
@@ -729,7 +729,7 @@ func listFilesystemsRecursive(ctx context.Context, root *zfs.DatasetPath,
 }
 
 func makeFilesystems(ctx context.Context, root *zfs.DatasetPath,
-	items []*zfs.ZFSProperties,
+	includingRoot bool, items []*zfs.ZFSProperties,
 ) ([]*pdu.Filesystem, error) {
 	// present filesystem without the root_fs prefix
 	fss := make([]*pdu.Filesystem, 0, len(items))
@@ -759,7 +759,10 @@ func makeFilesystems(ctx context.Context, root *zfs.DatasetPath,
 		}
 		l.WithField("receive_resume_token", token).Debug("receive resume token")
 
-		p.TrimPrefix(root)
+		if !includingRoot {
+			p.TrimPrefix(root)
+		}
+
 		fss = append(fss, &pdu.Filesystem{
 			Path:          p.ToString(),
 			IsPlaceholder: state.IsPlaceholder,