diff options
| author | Matthew Ahrens <mahrens@delphix.com> | 2013-08-26 13:13:26 -0800 |
|---|---|---|
| committer | Christopher Siden <chris.siden@delphix.com> | 2013-08-26 14:13:26 -0700 |
| commit | 69962b5647e4a8b9b14998733b765925381b727e (patch) | |
| tree | 50e01cfb5f5ee95ac72a5296ca84b10aa0ac75cb /usr/src/lib/libzpool | |
| parent | 7e0e2549bfaa531aff576083ab0c07f84fa8fb27 (diff) | |
| download | illumos-joyent-69962b5647e4a8b9b14998733b765925381b727e.tar.gz | |
4045 zfs write throttle & i/o scheduler performance work
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: Ned Bass <bass6@llnl.gov>
Reviewed by: Brendan Gregg <brendan.gregg@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/lib/libzpool')
| -rw-r--r-- | usr/src/lib/libzpool/common/llib-lzpool | 4 | ||||
| -rw-r--r-- | usr/src/lib/libzpool/common/sys/zfs_context.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/lib/libzpool/common/llib-lzpool b/usr/src/lib/libzpool/common/llib-lzpool index 7e61b55a91..6c64977c32 100644 --- a/usr/src/lib/libzpool/common/llib-lzpool +++ b/usr/src/lib/libzpool/common/llib-lzpool @@ -24,7 +24,7 @@ */ /* - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. */ /* LINTLIBRARY */ @@ -64,4 +64,4 @@ extern uint64_t metaslab_gang_bang; extern uint64_t metaslab_df_alloc_threshold; extern boolean_t zfeature_checks_disable; -extern uint64_t zfs_deadman_synctime; +extern uint64_t zfs_deadman_synctime_ms; diff --git a/usr/src/lib/libzpool/common/sys/zfs_context.h b/usr/src/lib/libzpool/common/sys/zfs_context.h index 8d55a0140f..3aa58fb05a 100644 --- a/usr/src/lib/libzpool/common/sys/zfs_context.h +++ b/usr/src/lib/libzpool/common/sys/zfs_context.h @@ -165,6 +165,8 @@ extern int aok; */ #define curthread ((void *)(uintptr_t)thr_self()) +#define kpreempt(x) yield() + typedef struct kthread kthread_t; #define thread_create(stk, stksize, func, arg, len, pp, state, pri) \ |