diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-05-17 18:26:57 +0000 |
| commit | 04b244dd661c24b510ac22936decfc0972d202d3 (patch) | |
| tree | 3ebfef98afc303fddf3415d6fba64e8682f495e8 /usr/src/uts/common/sys | |
| parent | eac250589e41f1b705e1b7427b02b3379aac9f9e (diff) | |
| parent | a69187741b83640a90dd8586195456dd50c016a8 (diff) | |
| download | illumos-joyent-20120517.tar.gz | |
Merge git.joyent.com:illumos-joyent20120517
Diffstat (limited to 'usr/src/uts/common/sys')
| -rw-r--r-- | usr/src/uts/common/sys/fs/zfs.h | 7 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/ib/mgt/ibcm/ibcm_impl.h | 16 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/ucode.h | 1 |
3 files changed, 14 insertions, 10 deletions
diff --git a/usr/src/uts/common/sys/fs/zfs.h b/usr/src/uts/common/sys/fs/zfs.h index baa201d7a5..a523201954 100644 --- a/usr/src/uts/common/sys/fs/zfs.h +++ b/usr/src/uts/common/sys/fs/zfs.h @@ -21,7 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2012 by Delphix. All rights reserved. * Copyright 2011 Nexenta Systems, Inc. All rights reserved. */ @@ -167,6 +167,7 @@ typedef enum { ZPOOL_PROP_ALLOCATED, ZPOOL_PROP_READONLY, ZPOOL_PROP_COMMENT, + ZPOOL_PROP_EXPANDSZ, ZPOOL_NUM_PROPS } zpool_prop_t; @@ -672,6 +673,7 @@ typedef struct vdev_stat { uint64_t vs_space; /* total capacity */ uint64_t vs_dspace; /* deflated capacity */ uint64_t vs_rsize; /* replaceable dev size */ + uint64_t vs_esize; /* expandable dev size */ uint64_t vs_ops[ZIO_TYPES]; /* operation count */ uint64_t vs_bytes[ZIO_TYPES]; /* bytes read/written */ uint64_t vs_read_errors; /* read errors */ @@ -788,7 +790,8 @@ typedef enum zfs_ioc { ZFS_IOC_SPACE_WRITTEN, ZFS_IOC_SPACE_SNAPS, ZFS_IOC_DESTROY_SNAPS_NVL, - ZFS_IOC_POOL_REGUID + ZFS_IOC_POOL_REGUID, + ZFS_IOC_POOL_REOPEN } zfs_ioc_t; /* diff --git a/usr/src/uts/common/sys/ib/mgt/ibcm/ibcm_impl.h b/usr/src/uts/common/sys/ib/mgt/ibcm/ibcm_impl.h index 2fb6454396..e7751760bd 100644 --- a/usr/src/uts/common/sys/ib/mgt/ibcm/ibcm_impl.h +++ b/usr/src/uts/common/sys/ib/mgt/ibcm/ibcm_impl.h @@ -2170,15 +2170,15 @@ void ibcm_dump_noderec(sa_node_record_t *); void ibcm_query_classport_info(ibt_channel_hdl_t channel); -#define IBCM_DUMP_RAW_MSG ibcm_dump_raw_message -#define IBCM_DUMP_SERVICE_REC ibcm_dump_srvrec -#define IBCM_DUMP_PATH_REC ibcm_dump_pathrec -#define IBCM_DUMP_NODE_REC ibcm_dump_noderec +#define IBCM_DUMP_RAW_MSG(x) ibcm_dump_raw_message(x) +#define IBCM_DUMP_SERVICE_REC(x) ibcm_dump_srvrec(x) +#define IBCM_DUMP_PATH_REC(x) ibcm_dump_pathrec(x) +#define IBCM_DUMP_NODE_REC(x) ibcm_dump_noderec(x) #else -#define IBCM_DUMP_RAW_MSG 0 && -#define IBCM_DUMP_SERVICE_REC 0 && -#define IBCM_DUMP_PATH_REC 0 && -#define IBCM_DUMP_NODE_REC 0 && +#define IBCM_DUMP_RAW_MSG(x) +#define IBCM_DUMP_SERVICE_REC(x) +#define IBCM_DUMP_PATH_REC(x) +#define IBCM_DUMP_NODE_REC(x) #endif ibt_status_t ibcm_ibmf_analyze_error(int ibmf_status); diff --git a/usr/src/uts/common/sys/ucode.h b/usr/src/uts/common/sys/ucode.h index e4f01bfeb0..d96c354c45 100644 --- a/usr/src/uts/common/sys/ucode.h +++ b/usr/src/uts/common/sys/ucode.h @@ -116,6 +116,7 @@ typedef struct ucode_file_amd { uint8_t uf_resv[896]; uint8_t uf_code_present; uint8_t uf_code[191]; + uint8_t uf_encr[2048]; #else uint8_t *ucodep; uint32_t usize; |