diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-02-23 13:15:17 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-02-23 13:15:17 +0000 |
| commit | 967de6457ff91be58e3a1013db109b646d90e174 (patch) | |
| tree | 22ffc8efe31f207210c3e48e392574f0282d2cbe /usr/src/uts/common | |
| parent | 50aa58e2e2de5002cada92081b9903a6246caf07 (diff) | |
| parent | ce3c309f71f6893197099bfac06adb66f0870d7d (diff) | |
| download | illumos-joyent-967de6457ff91be58e3a1013db109b646d90e174.tar.gz | |
[illumos-gate merge]
commit ce3c309f71f6893197099bfac06adb66f0870d7d
872 remove duplicate daemon() definitions
commit a1cf91d7adb92b3440a7ed1b01e3170ec61e9350
5644 rpcinfo(1m): The first synopsis supports the -T option too
commit ff3aea39f71c371be25b08deb9efed41f1c95983
5639 want reentrant ether_aton_r and ether_ntoa_r
commit bfce16ba853698e8a82133cf3ddb3ff143d14289
5627 svccfg export should accept instance FMRIs
commit 1a902ef8628b0dffd6df5442354ab59bb8530962
5561 support root pools on EFI/GPT partitioned disks
5125 update zpool/libzfs to manage bootable whole disk pools (EFI/GPT labeled disks)
commit 44bc9120699af80bb18366ca474cb2c618608ca9
5560 grub should support EFI/GPT partitioning
commit b0e753dd6a955fb2f10a0ce17d32bd33172e0400
5609 port mod_ipp to Apache 2.2
Conflicts:
usr/src/lib/print/mod_ipp/Makefile
exception_lists/cstyle
Diffstat (limited to 'usr/src/uts/common')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/vdev.c | 4 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/ethernet.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/usr/src/uts/common/fs/zfs/vdev.c b/usr/src/uts/common/fs/zfs/vdev.c index 6ee2a91dbd..9bc46ce64d 100644 --- a/usr/src/uts/common/fs/zfs/vdev.c +++ b/usr/src/uts/common/fs/zfs/vdev.c @@ -21,8 +21,8 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2011, 2014 by Delphix. All rights reserved. + * Copyright 2015 Nexenta Systems, Inc. All rights reserved. */ #include <sys/zfs_context.h> @@ -3204,8 +3204,6 @@ vdev_is_bootable(vdev_t *vd) strcmp(vdev_type, VDEV_TYPE_MISSING) == 0) { return (B_FALSE); } - } else if (vd->vdev_wholedisk == 1) { - return (B_FALSE); } for (int c = 0; c < vd->vdev_children; c++) { diff --git a/usr/src/uts/common/sys/ethernet.h b/usr/src/uts/common/sys/ethernet.h index 6c9aeef4af..5b9de2f2bf 100644 --- a/usr/src/uts/common/sys/ethernet.h +++ b/usr/src/uts/common/sys/ethernet.h @@ -38,6 +38,7 @@ extern "C" { #define ETHERADDRL (6) /* ethernet address length in octets */ #define ETHERFCSL (4) /* ethernet FCS length in octets */ +#define ETHERADDRSTRL (18) /* char size of ETHERADDRL with null */ /* * Ethernet address - 6 octets @@ -144,7 +145,9 @@ extern char *ether_sprintf(struct ether_addr *); extern int ether_aton(char *, uchar_t *); #else /* _KERNEL */ extern char *ether_ntoa(const struct ether_addr *); +extern char *ether_ntoa_r(const struct ether_addr *, char *); extern struct ether_addr *ether_aton(const char *); +extern struct ether_addr *ether_aton_r(const char *, struct ether_addr *); extern int ether_ntohost(char *, const struct ether_addr *); extern int ether_hostton(const char *, struct ether_addr *); extern int ether_line(const char *, struct ether_addr *, char *); |