diff options
| author | Paul Dagnelie <pcd@delphix.com> | 2015-07-17 14:51:38 -0700 |
|---|---|---|
| committer | Matthew Ahrens <mahrens@delphix.com> | 2015-07-19 22:34:19 -0700 |
| commit | a2cdcdd260232b58202b11a9bfc0103c9449ed52 (patch) | |
| tree | 7168b56d79c8d5cc85910df0d0f226a431e72d55 /usr/src/cmd/ndmpd | |
| parent | e47aa97b65b6eaa7016357de7fb7974c1982858c (diff) | |
| download | illumos-joyent-a2cdcdd260232b58202b11a9bfc0103c9449ed52.tar.gz | |
5960 zfs recv should prefetch indirect blocks
5925 zfs receive -o origin=
Reviewed by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Diffstat (limited to 'usr/src/cmd/ndmpd')
| -rw-r--r-- | usr/src/cmd/ndmpd/ndmp/ndmpd_zfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/cmd/ndmpd/ndmp/ndmpd_zfs.c b/usr/src/cmd/ndmpd/ndmp/ndmpd_zfs.c index 6afb3d3c45..e37cfb68c4 100644 --- a/usr/src/cmd/ndmpd/ndmp/ndmpd_zfs.c +++ b/usr/src/cmd/ndmpd/ndmp/ndmpd_zfs.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2011, 2014 by Delphix. All rights reserved. */ /* @@ -916,7 +916,7 @@ ndmpd_zfs_restore_recv_write(ndmpd_zfs_args_t *ndmpd_zfs_args) flags.force = B_TRUE; err = zfs_receive(ndmpd_zfs_args->nz_zlibh, ndmpd_zfs_args->nz_dataset, - &flags, ndmpd_zfs_args->nz_pipe_fd[PIPE_ZFS], NULL); + NULL, &flags, ndmpd_zfs_args->nz_pipe_fd[PIPE_ZFS], NULL); if (err && !session->ns_data.dd_abort) NDMPD_ZFS_LOG_ZERR(ndmpd_zfs_args, "zfs_receive: %d", err); |