diff options
author | Keith M Wesolowski <[email protected]> | 2013-07-27 10:50:07 -0700 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2013-11-04 11:27:41 -0800 |
commit | 831baf06efb3023ddee7ed41800d3b44521bf2ee (patch) | |
tree | 01347f77efc0f3a717c3f143d960bf9e5db3d065 /include/sys/dmu_send.h | |
parent | 19580676295b4e271da63dce145bb17c3731d069 (diff) |
Illumos #3875
3875 panic in zfs_root() after failed rollback
Reviewed by: Jerry Jelinek <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Approved by: Gordon Ross <[email protected]>
References:
https://www.illumos.org/issues/3875
illumos/illumos-gate@91948b51b8e978ddc88a36b2bc3ae83c20cdc9aa
Ported-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #1775
Diffstat (limited to 'include/sys/dmu_send.h')
-rw-r--r-- | include/sys/dmu_send.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sys/dmu_send.h b/include/sys/dmu_send.h index ee0885a60..6442b20f7 100644 --- a/include/sys/dmu_send.h +++ b/include/sys/dmu_send.h @@ -55,12 +55,13 @@ typedef struct dmu_recv_cookie { struct avl_tree *drc_guid_to_ds_map; zio_cksum_t drc_cksum; uint64_t drc_newsnapobj; + void *drc_owner; } dmu_recv_cookie_t; int dmu_recv_begin(char *tofs, char *tosnap, struct drr_begin *drrb, boolean_t force, char *origin, dmu_recv_cookie_t *drc); int dmu_recv_stream(dmu_recv_cookie_t *drc, struct vnode *vp, offset_t *voffp, int cleanup_fd, uint64_t *action_handlep); -int dmu_recv_end(dmu_recv_cookie_t *drc); +int dmu_recv_end(dmu_recv_cookie_t *drc, void *owner); #endif /* _DMU_SEND_H */ |