diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-10-19 12:24:35 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-10-19 12:24:35 +0000 |
| commit | 16ffff491e3c6443c7c0987b8738218c9e43594d (patch) | |
| tree | 2dbdf1be46a7b46a5344ceca7a4d991d9a9f8504 /usr/src/common/zfs/zfeature_common.c | |
| parent | f1ecf18129ec0b371c3adcd0cecac5593434cb8e (diff) | |
| parent | 2a446632681882e5dfe50f2f301401588f1ce734 (diff) | |
| download | illumos-joyent-16ffff491e3c6443c7c0987b8738218c9e43594d.tar.gz | |
[illumos-gate merge]
commit 2a446632681882e5dfe50f2f301401588f1ce734
6328 Fix cstyle errors in zfs codebase (fix studio)
commit 61679b0b6826b0ae7e3f751acd91412fcfa45d1e
commit 9a686fbc186e8e2a64e9a5094d44c7d6fa0ea167
6328 Fix cstyle errors in zfs codebase
commit 21227944c2bcc086121a5428f3f9d2496ba646f5
5876 sys/regset.h pollutes name space
commit 6a72db4a7fa12c3e0d1c1cf91a07390739fa0fbf
6208 add support for timerfd
commit f3bb54f387fc03cf651e19bbee54cc88ee51bb29
6291 nested epoll does not mimic Linux behavior
commit a5eb7107f06a6e23e8e77e8d3a84c1ff90a73ac6
5640 want epoll support
commit 7509ca605713ac7f244b0e812b1712dd25f04da1
6027 EOL zulu (XVR-4000)
commit e7df7762bfed06e996cc80f583cbee2d8ed81d69
6324 Add an `ndp' tool for manipulating the neighbors table
Conflicts:
usr/src/uts/common/io/timerfd.c
usr/src/uts/common/io/devpoll.c
usr/src/man/man9e/chpoll.9e
usr/src/man/man5/timerfd.5
usr/src/man/man5/epoll.5
usr/src/man/man3c/timerfd_create.3c
usr/src/man/man3c/epoll_wait.3c
usr/src/man/man3c/epoll_ctl.3c
usr/src/man/man3c/epoll_create.3c
usr/src/cmd/cmd-inet/usr.sbin/ndp.c
Diffstat (limited to 'usr/src/common/zfs/zfeature_common.c')
| -rw-r--r-- | usr/src/common/zfs/zfeature_common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/common/zfs/zfeature_common.c b/usr/src/common/zfs/zfeature_common.c index f75894b44d..a001255289 100644 --- a/usr/src/common/zfs/zfeature_common.c +++ b/usr/src/common/zfs/zfeature_common.c @@ -118,7 +118,8 @@ zfeature_lookup_name(const char *name, spa_feature_t *res) } boolean_t -zfeature_depends_on(spa_feature_t fid, spa_feature_t check) { +zfeature_depends_on(spa_feature_t fid, spa_feature_t check) +{ zfeature_info_t *feature = &spa_feature_table[fid]; for (int i = 0; feature->fi_depends[i] != SPA_FEATURE_NONE; i++) { |