diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-06-10 12:03:01 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-06-10 12:03:01 +0000 |
| commit | 301612afc3ef38a67f1adb329b36dae1bddf9034 (patch) | |
| tree | 67480c0403a52379edfa7ff86522e0ea84bf3934 /usr/src/cmd/zoneadm/zfs.c | |
| parent | 3a73555a6bf9a4594d44713855d2396974e5f9ad (diff) | |
| parent | bc07d1fd58f705e3a6d5b418433e42cd8e42b7f1 (diff) | |
| download | illumos-joyent-301612afc3ef38a67f1adb329b36dae1bddf9034.tar.gz | |
[illumos-gate merge]
commit a76660dbabd3d3b161bdead081ce275af6966d2e
7083 create_ramdisk.sh need not check for inuse devices
commit 3f85b2aed8a5768f4c20db925cdf8fc072472037
7036 zvol_swap_004_pos test failed
commit 10e67aa0db0823d5464aafdd681f3c966155c68e
7082 bptree_iterate() passes wrong args to zfs_dbgmsg()
commit 2404c9e6b54f427b32dd0a2d46940d6a4c5299bc
7062 Connections remain in TIME_WAIT too long
7061 local TCP connections should be expediently purged from TIME_WAIT
commit 9adfa60d484ce2435f5af77cc99dcd4e692b6660
6314 buffer overflow in dsl_dataset_name
commit 0c779ad424a92a84d1e07d47cab7f8009189202b
7054 dmu_tx_hold_t should use refcount_t to track space
Diffstat (limited to 'usr/src/cmd/zoneadm/zfs.c')
| -rw-r--r-- | usr/src/cmd/zoneadm/zfs.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr/src/cmd/zoneadm/zfs.c b/usr/src/cmd/zoneadm/zfs.c index a318a06dfb..214340d0ce 100644 --- a/usr/src/cmd/zoneadm/zfs.c +++ b/usr/src/cmd/zoneadm/zfs.c @@ -21,8 +21,8 @@ /* * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2012, 2015 by Delphix. All rights reserved. * Copyright (c) 2016 Martin Matuska. All rights reserved. */ @@ -261,7 +261,7 @@ take_snapshot(zfs_handle_t *zhp, char *snapshot_name, int snap_size, char *presnapbuf, char *postsnapbuf) { int res; - char template[ZFS_MAXNAMELEN]; + char template[ZFS_MAX_DATASET_NAME_LEN]; zfs_snapshot_data_t cb; /* @@ -563,8 +563,8 @@ static int get_direct_clone(zfs_handle_t *zhp, void *data) { clone_data_t *cd = data; - char origin[ZFS_MAXNAMELEN]; - char ds_path[ZFS_MAXNAMELEN]; + char origin[ZFS_MAX_DATASET_NAME_LEN]; + char ds_path[ZFS_MAX_DATASET_NAME_LEN]; if (zfs_get_type(zhp) != ZFS_TYPE_FILESYSTEM) { zfs_close(zhp); @@ -668,7 +668,7 @@ rename_snap(zfs_handle_t *zhp, void *data) { int res; zfs_snapshot_data_t *cbp; - char template[ZFS_MAXNAMELEN]; + char template[ZFS_MAX_DATASET_NAME_LEN]; cbp = (zfs_snapshot_data_t *)data; @@ -724,8 +724,8 @@ static int promote_clone(zfs_handle_t *src_zhp, zfs_handle_t *cln_zhp) { zfs_snapshot_data_t sd; - char nm[ZFS_MAXNAMELEN]; - char template[ZFS_MAXNAMELEN]; + char nm[ZFS_MAX_DATASET_NAME_LEN]; + char template[ZFS_MAX_DATASET_NAME_LEN]; (void) strlcpy(nm, zfs_get_name(cln_zhp), sizeof (nm)); /* @@ -785,7 +785,7 @@ int promote_all_clones(zfs_handle_t *zhp) { clone_data_t cd; - char nm[ZFS_MAXNAMELEN]; + char nm[ZFS_MAX_DATASET_NAME_LEN]; cd.clone_zhp = NULL; cd.origin_creation = 0; @@ -1207,7 +1207,7 @@ verify_datasets(zone_dochandle_t handle) struct zone_dstab dstab; zfs_handle_t *zhp; char propbuf[ZFS_MAXPROPLEN]; - char source[ZFS_MAXNAMELEN]; + char source[ZFS_MAX_DATASET_NAME_LEN]; zprop_source_t srctype; if (zonecfg_setdsent(handle) != Z_OK) { |