diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-01-07 12:16:13 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-01-07 12:16:13 +0000 |
| commit | 17b974fd157ce0a3ad6695d6818f02678dbd83a2 (patch) | |
| tree | 76fa83b305c397f5f4eb6b910c4040cb9a3ac34c /usr/src/lib/libzfs | |
| parent | a3e066d982285d1569eefd0c352986e5b8e28ecf (diff) | |
| parent | c33daa8a12c00116c8a2c9e33f05c08a53937de3 (diff) | |
| download | illumos-joyent-release-20160107.tar.gz | |
[illumos-gate merge]release-20160107
commit c33daa8a12c00116c8a2c9e33f05c08a53937de3
6543 Memory leak in uu_avl_pool_destroy
commit cb605c4d8ab24b5a900b8b4ca85db65c22d05fad
6544 incorrect comment in libzfs.h about offline status
commit 1962723d77534d1a0a079b951e47a3791c886092
6545 fix for 6540 did miss the pam_sm_close_session()
Diffstat (limited to 'usr/src/lib/libzfs')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs.h b/usr/src/lib/libzfs/common/libzfs.h index d4970e38c1..0125d9884f 100644 --- a/usr/src/lib/libzfs/common/libzfs.h +++ b/usr/src/lib/libzfs/common/libzfs.h @@ -324,7 +324,7 @@ typedef enum { ZPOOL_STATUS_VERSION_OLDER, /* older legacy on-disk version */ ZPOOL_STATUS_FEAT_DISABLED, /* supported features are disabled */ ZPOOL_STATUS_RESILVERING, /* device being resilvered */ - ZPOOL_STATUS_OFFLINE_DEV, /* device online */ + ZPOOL_STATUS_OFFLINE_DEV, /* device offline */ ZPOOL_STATUS_REMOVED_DEV, /* removed device */ /* |