diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-11-07 16:39:21 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-11-07 16:39:21 +0000 |
| commit | e46b615a809a16dc4fe18a3ed07f823fa4a5189f (patch) | |
| tree | ce0e7be16cd624c7ad39c4890d73d433c944ac07 /usr/src/lib/libzpool/common/taskq.c | |
| parent | f8b9ed83a90e9c166708a03e903b5c036158dbfe (diff) | |
| parent | b515258426fed6c7311fd3f1dea697cfbd4085c6 (diff) | |
| download | illumos-joyent-e46b615a809a16dc4fe18a3ed07f823fa4a5189f.tar.gz | |
[illumos-gate merge]
commit b515258426fed6c7311fd3f1dea697cfbd4085c6
5027 zfs large block support
commit f3477bb2505a35e160b09c9dbf5476112be4fa7d
4457 we apparently change .comment of almost every userland object
commit 738f37bc3dcd61e8a893af0f2d466d76690b70ec
5244 zio pipeline callers should explicitly invoke next stage
commit f7950bf1145637c6dc57742a8bb95631fd5c846f
5243 zdb -b could be much faster
commit cffcfaee1e6b29ef9ceb7d80e4e053ffd029906b
5270 ld(1) cannot handle CIE version 3 in .eh_frame
Conflicts:
usr/src/man/man1m/zfs.1m
Diffstat (limited to 'usr/src/lib/libzpool/common/taskq.c')
| -rw-r--r-- | usr/src/lib/libzpool/common/taskq.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/src/lib/libzpool/common/taskq.c b/usr/src/lib/libzpool/common/taskq.c index 2c5dfd86dc..a4ab58963d 100644 --- a/usr/src/lib/libzpool/common/taskq.c +++ b/usr/src/lib/libzpool/common/taskq.c @@ -25,6 +25,7 @@ /* * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright 2012 Garrett D'Amore <garrett@damore.org>. All rights reserved. + * Copyright (c) 2014 by Delphix. All rights reserved. */ #include <sys/zfs_context.h> @@ -33,8 +34,10 @@ int taskq_now; taskq_t *system_taskq; #define TASKQ_ACTIVE 0x00010000 +#define TASKQ_NAMELEN 31 struct taskq { + char tq_name[TASKQ_NAMELEN + 1]; kmutex_t tq_lock; krwlock_t tq_threadlock; kcondvar_t tq_dispatch_cv; @@ -247,6 +250,7 @@ taskq_create(const char *name, int nthreads, pri_t pri, cv_init(&tq->tq_dispatch_cv, NULL, CV_DEFAULT, NULL); cv_init(&tq->tq_wait_cv, NULL, CV_DEFAULT, NULL); cv_init(&tq->tq_maxalloc_cv, NULL, CV_DEFAULT, NULL); + (void) strncpy(tq->tq_name, name, TASKQ_NAMELEN + 1); tq->tq_flags = flags | TASKQ_ACTIVE; tq->tq_active = nthreads; tq->tq_nthreads = nthreads; |