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/halt | |
| 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/halt')
| -rw-r--r-- | usr/src/cmd/halt/halt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/cmd/halt/halt.c b/usr/src/cmd/halt/halt.c index 3b57e02c64..8464619a68 100644 --- a/usr/src/cmd/halt/halt.c +++ b/usr/src/cmd/halt/halt.c @@ -25,6 +25,7 @@ */ /* * Copyright (c) 2013, Joyent, Inc. All rights reserved. + * Copyright (c) 2015 by Delphix. All rights reserved. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -720,7 +721,7 @@ validate_zfs_err_out: */ static int get_zfs_bootfs_arg(const char *arg, const char ** fpth, int *is_zfs, - char *bootfs_arg) + char *bootfs_arg) { zfs_handle_t *zhp = NULL; zpool_handle_t *zpoolp = NULL; @@ -728,8 +729,8 @@ get_zfs_bootfs_arg(const char *arg, const char ** fpth, int *is_zfs, struct mnttab mnt; char *poolname = NULL; char physpath[MAXPATHLEN]; - char mntsp[ZPOOL_MAXNAMELEN]; - char bootfs[ZPOOL_MAXNAMELEN]; + char mntsp[ZFS_MAX_DATASET_NAME_LEN]; + char bootfs[ZFS_MAX_DATASET_NAME_LEN]; int rc = 0; size_t mntlen = 0; size_t msz; |