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/lib/libbe/common/be_mount.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/lib/libbe/common/be_mount.c')
| -rw-r--r-- | usr/src/lib/libbe/common/be_mount.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/lib/libbe/common/be_mount.c b/usr/src/lib/libbe/common/be_mount.c index 03cb03b128..40daff4cd6 100644 --- a/usr/src/lib/libbe/common/be_mount.c +++ b/usr/src/lib/libbe/common/be_mount.c @@ -21,10 +21,9 @@ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. - */ -/* * Copyright 2013 Nexenta Systems, Inc. All rights reserved. * Copyright 2015 EveryCity Ltd. + * Copyright (c) 2015 by Delphix. All rights reserved. */ /* @@ -1147,7 +1146,7 @@ be_mount_callback(zfs_handle_t *zhp, void *data) { zprop_source_t sourcetype; const char *fs_name = zfs_get_name(zhp); - char source[ZFS_MAXNAMELEN]; + char source[ZFS_MAX_DATASET_NAME_LEN]; char *altroot = data; char zhp_mountpoint[MAXPATHLEN]; char mountpoint[MAXPATHLEN]; @@ -1297,7 +1296,7 @@ be_unmount_callback(zfs_handle_t *zhp, void *data) be_unmount_data_t *ud = data; zprop_source_t sourcetype; const char *fs_name = zfs_get_name(zhp); - char source[ZFS_MAXNAMELEN]; + char source[ZFS_MAX_DATASET_NAME_LEN]; char mountpoint[MAXPATHLEN]; char *zhp_mountpoint; int ret = 0; @@ -2036,7 +2035,7 @@ static int fix_mountpoint_callback(zfs_handle_t *zhp, void *data) { zprop_source_t sourcetype; - char source[ZFS_MAXNAMELEN]; + char source[ZFS_MAX_DATASET_NAME_LEN]; char mountpoint[MAXPATHLEN]; char *zhp_mountpoint = NULL; char *altroot = data; |