]> git.proxmox.com Git - mirror_zfs.git/commit
Fix recovery import (-F) with encrypted pool
authorTom Caputi <tcaputi@datto.com>
Mon, 4 Dec 2017 19:10:31 +0000 (14:10 -0500)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 2 Feb 2018 19:39:36 +0000 (11:39 -0800)
commitd53bd7f5244a1cd0009d2f90d3ec9df22352fbb3
tree472894a60cddd8ea9de2d87533097cc832911905
parentae76f45cda0e0857f99e53959cf71c7a5d66bd8b
Fix recovery import (-F) with encrypted pool

When performing zil_claim() at pool import time, it is
important that encrypted datasets set os_next_write_raw
before writing to the zil_header_t. This prevents the code
from attempting to re-authenticate the objset_phys_t when
it writes it out, which is unnecessary because the
zil_header_t is not protected by either objset MAC and
impossible since the keys aren't loaded yet. Unfortunately,
one of the code paths did not set this flag, which causes
failed ASSERTs during 'zpool import -F'. This patch corrects
this issue.

Reviewed-by: Jorgen Lundman <lundman@lundman.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes #6864
Closes #6916
module/zfs/zil.c