]> granicus.if.org Git - zfs/commit
Always refuse receving non-resume stream when resume state exists
authorAndriy Gapon <avg@FreeBSD.org>
Tue, 3 Sep 2019 17:56:55 +0000 (20:56 +0300)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 3 Sep 2019 17:56:55 +0000 (10:56 -0700)
commitebeb6f23bf7e8fe6732a05267ed1cab4c38d3b23
treecaa4d1dddd3c3b60a1e614c7b134876b1afa2979
parent1a504d27df4657d394d9a924c2e7796b692ff993
Always refuse receving non-resume stream when resume state exists

This fixes a hole in the situation where the resume state is left from
receiving a new dataset and, so, the state is set on the dataset itself
(as opposed to %recv child).

Additionally, distinguish incremental and resume streams in error
messages.

Reviewed-by: Matt Ahrens <matt@delphix.com>
Reviewed-by: Tom Caputi <tcaputi@datto.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Andriy Gapon <avg@FreeBSD.org>
Closes #9252
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_recv.c