diff options
| author | Paul Dagnelie <[email protected]> | 2020-09-22 16:16:07 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-09-22 16:16:07 -0700 |
| commit | 20dfe8cd3b63773f0c50a5c611300843c28ef6ae (patch) | |
| tree | fcc0272773b73a2c30da73ce69d22d507da5cc03 /module/zfs | |
| parent | e865e7809e3c920d1d37e52978ea1175957cc4a0 (diff) | |
Don't set numobjs to UINT64_MAX or near it
Resolves an issue with `zfs send` streams from 0.8.4 which
prevents them from being received by versions < 0.7.
Reviewed-by: Matthew Ahrens <[email protected]>
Reviewed-by: Paul Zuchowski <[email protected]>
Signed-off-by: Paul Dagnelie <[email protected]>
Closes #10911
Closes #10916
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/dmu_send.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c index 33e99c2e0..07c2d6ef2 100644 --- a/module/zfs/dmu_send.c +++ b/module/zfs/dmu_send.c @@ -643,7 +643,7 @@ dump_freeobjects(dmu_send_cookie_t *dscp, uint64_t firstobj, uint64_t numobjs) * receiving side. */ if (maxobj > 0) { - if (maxobj < firstobj) + if (maxobj <= firstobj) return (0); if (maxobj < firstobj + numobjs) @@ -663,8 +663,6 @@ dump_freeobjects(dmu_send_cookie_t *dscp, uint64_t firstobj, uint64_t numobjs) return (SET_ERROR(EINTR)); dscp->dsc_pending_op = PENDING_NONE; } - if (numobjs == 0) - numobjs = UINT64_MAX - firstobj; if (dscp->dsc_pending_op == PENDING_FREEOBJECTS) { /* |