From ea97f8ce35a8a515610e52b7e4744549f9c510f4 Mon Sep 17 00:00:00 2001 From: Matthew Ahrens Date: Mon, 29 Jul 2013 10:58:53 -0800 Subject: Illumos #3834 3834 incremental replication of 'holey' file systems is slow Reviewed by: Adam Leventhal Reviewed by: George Wilson Approved by: Richard Lowe References: https://www.illumos.org/issues/3834 illumos/illumos-gate@ca48f36f20f6098ceb19d5b084b6b3d4b8eca9fa Ported-by: Richard Yao Signed-off-by: Brian Behlendorf Issue #1775 --- include/sys/dmu_impl.h | 6 ++++++ include/sys/dmu_send.h | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'include/sys') diff --git a/include/sys/dmu_impl.h b/include/sys/dmu_impl.h index f13a2a37c..bbff15df9 100644 --- a/include/sys/dmu_impl.h +++ b/include/sys/dmu_impl.h @@ -21,7 +21,10 @@ /* * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + */ +/* * Copyright (c) 2012, Joyent, Inc. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. */ #ifndef _SYS_DMU_IMPL_H @@ -265,6 +268,9 @@ typedef struct dmu_sendarg { uint64_t dsa_toguid; int dsa_err; dmu_pendop_t dsa_pending_op; + boolean_t dsa_incremental; + uint64_t dsa_last_data_object; + uint64_t dsa_last_data_offset; } dmu_sendarg_t; #ifdef __cplusplus diff --git a/include/sys/dmu_send.h b/include/sys/dmu_send.h index 6442b20f7..65514b762 100644 --- a/include/sys/dmu_send.h +++ b/include/sys/dmu_send.h @@ -21,7 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012, Joyent, Inc. All rights reserved. */ @@ -63,5 +63,6 @@ int dmu_recv_begin(char *tofs, char *tosnap, struct drr_begin *drrb, 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, void *owner); +boolean_t dmu_objset_is_receiving(objset_t *os); #endif /* _DMU_SEND_H */ -- cgit v1.2.3