diff options
| author | mm <mm@FreeBSD.org> | 2013-02-18 11:48:08 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2013-02-18 11:48:08 +0000 |
| commit | eccd79d9d31400826692e06b14ae6653c8dcca63 (patch) | |
| tree | 8ad6a32967d38ffe0fde624edac1bf4ea5d36213 | |
| parent | 45651753611592fbf078a1d81e3e50642ecd37f3 (diff) | |
| download | FreeBSD-src-eccd79d9d31400826692e06b14ae6653c8dcca63.zip FreeBSD-src-eccd79d9d31400826692e06b14ae6653c8dcca63.tar.gz | |
Update vendor/illumos/dist and vendor-sys/illumos/dist
to illumos-gate 13957:512faafc0eaf
Illumos ZFS issues:
3537 want pool io kstats
| -rw-r--r-- | lib/libzpool/common/kernel.c | 34 | ||||
| -rw-r--r-- | lib/libzpool/common/sys/zfs_context.h | 10 |
2 files changed, 40 insertions, 4 deletions
diff --git a/lib/libzpool/common/kernel.c b/lib/libzpool/common/kernel.c index c698c23..cc0d542 100644 --- a/lib/libzpool/common/kernel.c +++ b/lib/libzpool/common/kernel.c @@ -80,8 +80,8 @@ zk_thread_create(void (*func)(), void *arg) */ /*ARGSUSED*/ kstat_t * -kstat_create(char *module, int instance, char *name, char *class, - uchar_t type, ulong_t ndata, uchar_t ks_flag) +kstat_create(const char *module, int instance, const char *name, + const char *class, uchar_t type, ulong_t ndata, uchar_t ks_flag) { return (NULL); } @@ -96,6 +96,36 @@ void kstat_delete(kstat_t *ksp) {} +/*ARGSUSED*/ +void +kstat_waitq_enter(kstat_io_t *kiop) +{} + +/*ARGSUSED*/ +void +kstat_waitq_exit(kstat_io_t *kiop) +{} + +/*ARGSUSED*/ +void +kstat_runq_enter(kstat_io_t *kiop) +{} + +/*ARGSUSED*/ +void +kstat_runq_exit(kstat_io_t *kiop) +{} + +/*ARGSUSED*/ +void +kstat_waitq_to_runq(kstat_io_t *kiop) +{} + +/*ARGSUSED*/ +void +kstat_runq_back_to_waitq(kstat_io_t *kiop) +{} + /* * ========================================================================= * mutexes diff --git a/lib/libzpool/common/sys/zfs_context.h b/lib/libzpool/common/sys/zfs_context.h index c638482..bcb27cf 100644 --- a/lib/libzpool/common/sys/zfs_context.h +++ b/lib/libzpool/common/sys/zfs_context.h @@ -255,10 +255,16 @@ extern void cv_broadcast(kcondvar_t *cv); /* * kstat creation, installation and deletion */ -extern kstat_t *kstat_create(char *, int, - char *, char *, uchar_t, ulong_t, uchar_t); +extern kstat_t *kstat_create(const char *, int, + const char *, const char *, uchar_t, ulong_t, uchar_t); extern void kstat_install(kstat_t *); extern void kstat_delete(kstat_t *); +extern void kstat_waitq_enter(kstat_io_t *); +extern void kstat_waitq_exit(kstat_io_t *); +extern void kstat_runq_enter(kstat_io_t *); +extern void kstat_runq_exit(kstat_io_t *); +extern void kstat_waitq_to_runq(kstat_io_t *); +extern void kstat_runq_back_to_waitq(kstat_io_t *); /* * Kernel memory |
