Merge pull request #2 from bgly/spp-zfs-0.8.1

Merged Allan's fixes for send/recv Resume
KlaraSystems · Jul 8, 2019 · 2d32c3c · 2d32c3c
2 parents 3016b94 + 266a61f
commit 2d32c3c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/include/sys/refcount.h b/include/sys/refcount.h
@@ -76,7 +76,7 @@ int64_t _zfs_refcount_add(zfs_refcount_t *, void *, const char *, size_t);
 #define	zfs_refcount_add(rc, holder_tag)	\
 	_zfs_refcount_add(rc, holder_tag, __FILE__, __LINE__)
 int64_t zfs_refcount_remove(zfs_refcount_t *, void *);
-int64_t _zfs_refcount_add_many(refcount_t *, uint64_t, void *, const char *,
+int64_t _zfs_refcount_add_many(zfs_refcount_t *, uint64_t, void *, const char *,
     size_t);
 #define	zfs_refcount_add_many(rc, number, holder_tag)	\
 	_zfs_refcount_add_many(rc, number, holder_tag, __FILE__, __LINE__)

diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c
@@ -1017,6 +1017,7 @@ dmu_send_init(struct send_thread_arg *to_arg, dsl_pool_t *dp,
 	dmu_sendarg_t *dsp;
 	int err;
 	uint64_t featureflags = 0;
+	size_t payload_len = 0;
 	file_t *fp;
 
 	*payload = NULL;
@@ -1163,7 +1164,8 @@ dmu_send_init(struct send_thread_arg *to_arg, dsl_pool_t *dp,
 			fnvlist_add_nvlist(nvl, "crypt_keydata", keynvl);
 		}
 
-		*payload = fnvlist_pack(nvl, (size_t *)&drr->drr_payloadlen);
+		*payload = fnvlist_pack(nvl, &payload_len);
+		drr->drr_payloadlen = payload_len;
 		fnvlist_free(keynvl);
 		fnvlist_free(nvl);
 	}

diff --git a/module/zfs/refcount.c b/module/zfs/refcount.c
@@ -121,7 +121,7 @@ zfs_refcount_count(zfs_refcount_t *rc)
 }
 
 int64_t
-_zfs_refcount_add_many(refcount_t *rc, uint64_t number, void *holder,
+_zfs_refcount_add_many(zfs_refcount_t *rc, uint64_t number, void *holder,
     const char *file, size_t line)
 {
 	reference_t *ref = NULL;