diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2013-03-01 21:01:45 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2013-03-01 21:01:45 +0000 |
| commit | 577227be9d7e7e691365c6df7c2c70a0cd5c0d96 (patch) | |
| tree | 019ac6a39f50b650c1907965f081edb16c3479b4 /lib/libzfs/common/libzfs_sendrecv.c | |
| parent | b9192d31aabb73ffd7d70eb6dd383aa9f924dc0a (diff) | |
| download | src-577227be9d7e7e691365c6df7c2c70a0cd5c0d96.tar.gz src-577227be9d7e7e691365c6df7c2c70a0cd5c0d96.zip | |
Update vendor/illumos/dist and vendor-sys/illumos/dist
to illumos-gate 13973:4972ab336f54
Illumos ZFS issues:
3464 zfs synctask code needs restructuring
Notes
Notes:
svn path=/vendor-sys/illumos/dist/; revision=247580
Diffstat (limited to 'lib/libzfs/common/libzfs_sendrecv.c')
| -rw-r--r-- | lib/libzfs/common/libzfs_sendrecv.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/libzfs/common/libzfs_sendrecv.c b/lib/libzfs/common/libzfs_sendrecv.c index ee6e64319e40..ea0634ee70c4 100644 --- a/lib/libzfs/common/libzfs_sendrecv.c +++ b/lib/libzfs/common/libzfs_sendrecv.c @@ -972,9 +972,7 @@ hold_for_send(zfs_handle_t *zhp, send_dump_data_t *sdd) */ if (pzhp) { error = zfs_hold(pzhp, thissnap, sdd->holdtag, - B_FALSE, B_TRUE, B_TRUE, sdd->cleanup_fd, - zfs_prop_get_int(zhp, ZFS_PROP_OBJSETID), - zfs_prop_get_int(zhp, ZFS_PROP_CREATETXG)); + B_FALSE, B_TRUE, sdd->cleanup_fd); zfs_close(pzhp); } @@ -1713,12 +1711,11 @@ recv_rename(libzfs_handle_t *hdl, const char *name, const char *tryname, err = ENOENT; } - if (err != 0 && strncmp(name+baselen, "recv-", 5) != 0) { + if (err != 0 && strncmp(name + baselen, "recv-", 5) != 0) { seq++; - (void) strncpy(newname, name, baselen); - (void) snprintf(newname+baselen, ZFS_MAXNAMELEN-baselen, - "recv-%u-%u", getpid(), seq); + (void) snprintf(newname, ZFS_MAXNAMELEN, "%.*srecv-%u-%u", + baselen, name, getpid(), seq); (void) strlcpy(zc.zc_value, newname, sizeof (zc.zc_value)); if (flags->verbose) { @@ -2643,7 +2640,6 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap, /* * Determine name of destination snapshot, store in zc_value. */ - (void) strcpy(zc.zc_top_ds, tosnap); (void) strcpy(zc.zc_value, tosnap); (void) strncat(zc.zc_value, chopprefix, sizeof (zc.zc_value)); free(cp); |