diff options
| author | Max Grossman <[email protected]> | 2015-04-08 11:37:13 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-05-13 09:03:59 -0700 |
| commit | 5dc8b7365ff1932bfd969bc71cd49db9b3a6dc87 (patch) | |
| tree | 03bbb6a4ffbe7b71a5d4f69e3cec42c75deb62ad /include/sys | |
| parent | 19b3b1d2a256ecac1f27278c593983f772322f09 (diff) | |
Illumos 5765 - add support for estimating send stream size with lzc_send_space when source is a bookmark
5765 add support for estimating send stream size with lzc_send_space when source is a bookmark
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Christopher Siden <[email protected]>
Reviewed by: Steven Hartland <[email protected]>
Reviewed by: Bayard Bell <[email protected]>
Approved by: Albert Lee <[email protected]>
References:
https://www.illumos.org/issues/5765
https://github.com/illumos/illumos-gate/commit/643da460
Porting notes:
* Unused variable 'recordsize' in dmu_send_estimate() dropped
Ported-by: DHE <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3397
Diffstat (limited to 'include/sys')
| -rw-r--r-- | include/sys/dmu_send.h | 4 | ||||
| -rw-r--r-- | include/sys/dsl_dataset.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/sys/dmu_send.h b/include/sys/dmu_send.h index 3a8dc89ab..2442a1f8a 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) 2013 by Delphix. All rights reserved. + * Copyright (c) 2012, 2014 by Delphix. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. */ @@ -42,6 +42,8 @@ int dmu_send(const char *tosnap, const char *fromsnap, int outfd, struct vnode *vp, offset_t *off); int dmu_send_estimate(struct dsl_dataset *ds, struct dsl_dataset *fromds, uint64_t *sizep); +int dmu_send_estimate_from_txg(struct dsl_dataset *ds, uint64_t fromtxg, + uint64_t *sizep); int dmu_send_obj(const char *pool, uint64_t tosnap, uint64_t fromsnap, boolean_t embedok, boolean_t large_block_ok, int outfd, struct vnode *vp, offset_t *off); diff --git a/include/sys/dsl_dataset.h b/include/sys/dsl_dataset.h index 1985ce824..d6da5dcfd 100644 --- a/include/sys/dsl_dataset.h +++ b/include/sys/dsl_dataset.h @@ -201,6 +201,9 @@ dsl_dataset_phys(dsl_dataset_t *ds) */ #define MAX_TAG_PREFIX_LEN 17 +#define dsl_dataset_is_snapshot(ds) \ + (dsl_dataset_phys(ds)->ds_num_children != 0) + #define DS_UNIQUE_IS_ACCURATE(ds) \ ((dsl_dataset_phys(ds)->ds_flags & DS_FLAG_UNIQUE_ACCURATE) != 0) |